require --rebuilddb to convert db1 -> db3, better messages.

CVS patchset: 3864
CVS date: 2000/06/18 22:38:37

30 files changed, 1582 insertions, 1036 deletions

diff --git a/CHANGES b/CHANGES
index 8bfbdd7f4..17948e07f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -61,6 +61,7 @@
 	- portability: sparc-sun-solaris2.5.1.
 	- fix: don't count removed files if removed packages is empty set.
 	- fix: permit '\0' as special case key (e.g. "/" in Basenames).
+	- require --rebuilddb to convert db1 -> db3, better messages.
 
 3.0.4 -> 3.0.5
 	- handle version 4 packaging as input.
diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index 69243f753..26608bd68 100644
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -20,6 +20,7 @@ static int _debug = 0;
 #include "misc.h"
 
 extern int _noDirTokens;
+static int _rebuildinprogress = 0;
 
 int _filterDbDups = 0;	/* Filter duplicate entries ? (bug in pre rpm-3.0.4) */
 
@@ -259,8 +260,8 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, unsigned int flags)
     Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n\
     and configure \"%%_dbapi -1\" (e.g. create and/or edit /etc/rpm/macros).\n\
 \n\
-"), _dbapi_wanted);
-	   return NULL;
+"),	    _dbapi_wanted);
+	    return NULL;
 	}
 	errno = 0;
 	dbi = NULL;
@@ -284,43 +285,89 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, unsigned int flags)
     	break;
     }
 
-    if (_dbapi <= 0) {		/* failed to open with any dbapi */
+    /* Failed to open with any dbapi */
+    if (_dbapi <= 0) {
 	static int _printed[32];
 	if (!_printed[dbix & 0x1f]++)
 	    rpmError(RPMERR_DBOPEN, _("dbiOpen: cannot open %s index"),
 		tagName(rpmtag));
 	rc = 1;
-    } else			/* suggest possible conversion */
-    if (_dbapi_wanted < 0 && _dbapi != _dbapi_rebuild) {
+	goto exit;
+    }
+
+    /* Require conversion. */
+    if (_dbapi_wanted >= 0 && _dbapi != _dbapi_wanted && _dbapi_wanted == _dbapi_rebuild) {
 	static int _printed = 0;
-	rc = (dbi->dbi_rpmtag != RPMDBI_PACKAGES);
+	rc = (_rebuildinprogress ? 0 : 1);
 	if (rc && !_printed++)
 	    fprintf(stderr, _("\n\
---> The database is in db%d format, not the suggested db%d format.\n\
-    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n\
-    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n\
-    to convert your database from db%d to db%d format, or configure\n\
-    \"%%_dbapi_rebuild %d\" (e.g. create and/or edit /etc/rpm/macros).\n\
+--> The rpm database is in db%d format, not the suggested db%d format.\n\
+    If you have just upgraded the rpm package you need to convert\n\
+    your database to db%d format by running \"rpm --rebuilddb\" as root.\n\
 \n\
-"), _dbapi, (_dbapi_rebuild > 0 ? _dbapi_rebuild : 3),
-    _dbapi, (_dbapi_rebuild > 0 ? _dbapi_rebuild : 3), _dbapi);
-    } else			/* suggest possible configuration */
+"),	_dbapi, (_dbapi_rebuild > 0 ? _dbapi_rebuild : 3),
+	(_dbapi_rebuild > 0 ? _dbapi_rebuild : 3));
+	goto exit;
+    }
+
+    /* Suggest possible configuration */
     if (_dbapi_wanted >= 0 && _dbapi != _dbapi_wanted) {
 	static int _printed = 0;
 	if (!_printed++)
 	    fprintf(stderr, _("\n\
---> The configured %%_dbapi was db%d, but the database is db%d format.\n\
+--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n\
     Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n\
     and configure \"%%_dbapi %d\" (e.g. create and/or edit /etc/rpm/macros).\n\
 \n\
-"), _dbapi_wanted, _dbapi, _dbapi);
+"),	_dbapi_wanted, _dbapi, _dbapi);
 	rc = 1;
+	goto exit;
+    }
+
+    /* Suggest possible configuration */
+    if (_dbapi_wanted < 0 && _dbapi != _dbapi_rebuild) {
+	static int _printed = 0;
+	rc = (_rebuildinprogress ? 0 : 1);
+	if (rc && !_printed++)
+	    fprintf(stderr, _("\n\
+--> The rpm database is in db%d format, not the suggested db%d format.\n\
+    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n\
+    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n\
+    to convert your database from db%d to db%d format, or configure\n\
+    \"%%_dbapi_rebuild %d\" (e.g. create and/or edit /etc/rpm/macros).\n\
+\n\
+"),	_dbapi, (_dbapi_rebuild > 0 ? _dbapi_rebuild : 3),
+	_dbapi, (_dbapi_rebuild > 0 ? _dbapi_rebuild : 3), _dbapi);
+	goto exit;
+    }
+
+    /* Two co-resident databases. */
+    if (rc == 0 && dbi) {
+	const char * pkgs = rpmGenPath(rpmdb->db_root, "%{_dbpath}/", "packages.rpm");
+	static int _printed = 0;
+
+	rc = (_dbapi > 1 && rpmfileexists(pkgs) && !_rebuildinprogress);
+	if (rc && !_printed++)
+		fprintf(stderr, _("\n\
+--> An rpm database in db1 format exists in %s.\n\
+    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n\
+\n\
+"),	pkgs, (_dbapi_rebuild > 0 ? _dbapi_rebuild : 3));
+	if (rc && dbi) {
+	    xfree(pkgs);
+	    pkgs = rpmGenPath( dbi->dbi_root, dbi->dbi_home,
+		(dbi->dbi_file ? dbi->dbi_file : tagName(dbi->dbi_rpmtag)));
+	    dbiClose(dbi, 0);
+	    unlink(pkgs);
+	}
+	xfree(pkgs);
+	goto exit;
     }
 
+exit:
     if (rc == 0 && dbi) {
 	rpmdb->_dbi[dbix] = dbi;
     } else if (dbi) {
-	/* XXX FIXME: dbNopen handles failures already. */
 	db3Free(dbi);
 	dbi = NULL;
     }
@@ -2225,6 +2272,7 @@ int rpmdbRebuild(const char * rootdir)
 
     _dbapi = rpmExpandNumeric("%{_dbapi}");
     _dbapi_rebuild = rpmExpandNumeric("%{_dbapi_rebuild}");
+    _rebuildinprogress = 1;
 
     tfn = rpmGetPath("%{_dbpath}", NULL);
     if (!(tfn && tfn[0] != '%')) {
diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index aec2361ce..c3613d307 100644
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -12,7 +12,7 @@ WriteMakefile(
 	      'CCFLAGS' => '-g -O2 -D_GNU_SOURCE -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts',
 	      'OPTIMIZE'=> '-g',
 	      'DEFINE'	=> '-Dbool=char -DHAS_BOOL',
-	      'INC'	=> ' -I../build -I../lib -I../popt -I/usr/include/rpm',
+	      'INC'	=> ' -I/usr/local/include -I../build -I../lib -I../popt -I/usr/include/rpm',
 	      'depend'	=> { 'rpm.c' => 'transaction.xs header.xs db.xs' },
 );
 
diff --git a/po/cs.po b/po/cs.po
index 41cf64a01..c1cc46d83 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-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-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"
@@ -3378,12 +3378,12 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3393,15 +3393,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "chyba: nelze otevřít %s\n"
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3409,152 +3429,151 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "chyba při získávání záznamu %s z %s"
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "chyba při ukládání záznamu %s do %s"
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "chyba při odstraňování záznamu %s do %s"
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "nebyla nastavena dbpath"
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "chyba při hledání balíčku %s\n"
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "nelze číst hlavičku u %d pro vyhledání"
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "odstraňuje se položka databáze\n"
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstraňuje se rejstřík skupin\n"
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "odstraňuje se rejstřík názvů\n"
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "chyba při hledání balíčku %s\n"
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "Probíhá získávání %s jako %s\n"
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "databáze se přestavuje v kořenovém adresáři %s\n"
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "dočasná databáze %s již existuje"
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "vytváří se adresář: %s\n"
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "chyba při vytváření adresáře %s: %s"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otevírá se stará databáze\n"
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otevírá se nová databáze\n"
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "záznam číslo %d v databázi je chybný -- vynechává se"
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "nelze přidat záznam - původně u %d"
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "databázi nelze přestavit; původní databáze zůstává na svém místě\n"
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr "starou databázi nelze nahradit novou databází!\n"
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "aby se obnovily, nahrazuje soubory v %s soubory z %s"
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "vytváří se adresář: %s\n"
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "nelze odstranit %s: %s\n"
diff --git a/po/da.po b/po/da.po
index a4babcca4..772eb2202 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-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-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"
@@ -3163,12 +3163,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3178,15 +3178,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3194,151 +3214,150 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 55d4c92fd..7a1696ba3 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-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-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"
@@ -3485,12 +3485,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3500,15 +3500,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "Fehler: kann %s nicht öffnen\n"
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3516,156 +3536,155 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "Fehler beim Eintrag %s von %s"
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
 
 # FIXME
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "ťdbpathŤ ist nicht gesetzt"
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen"
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
 # FIXME
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
 # FIXME
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "die temporäre Datenbank %s existiert schon"
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 "Eintrag Nummer %d in der Datenback ist nicht in Ordnung -- wird übersprungen"
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d"
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
 # , c-format
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
diff --git a/po/es.po b/po/es.po
index a4babcca4..772eb2202 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-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-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"
@@ -3163,12 +3163,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3178,15 +3178,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3194,151 +3214,150 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 3b90ef464..35d892913 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-06-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -3413,12 +3413,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3428,15 +3428,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "virhe: en voi avata %s\n"
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3444,151 +3464,150 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "virhe luettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "virhe talletettaessa tietuetta %s %s:ään"
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "dbpath ei ole asetettu"
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "en voi lukea headeria %d:stä päivittäessä"
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "väliaikainen tietokanta %s on jo olemassa"
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen"
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "en voi lisätä tietuetta %d:stä"
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "en voinut avata %s: %s"
diff --git a/po/fr.po b/po/fr.po
index b5d28384e..cd14687bd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-06-16 14:54-0400\n"
+msgstr "POT-Creation-Date: 2000-06-18 18:37-0400\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:422
 #, c-format
@@ -3398,12 +3398,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3413,15 +3413,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3429,151 +3449,150 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
diff --git a/po/gl.po b/po/gl.po
index a4babcca4..772eb2202 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-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-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"
@@ -3163,12 +3163,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3178,15 +3178,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3194,151 +3214,150 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index a4babcca4..772eb2202 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-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-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"
@@ -3163,12 +3163,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3178,15 +3178,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3194,151 +3214,150 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index a4babcca4..772eb2202 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-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-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"
@@ -3163,12 +3163,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3178,15 +3178,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3194,151 +3214,150 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 400a799a7..04cd227f0 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-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-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"
@@ -3158,12 +3158,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3173,15 +3173,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3189,151 +3209,150 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index a4babcca4..772eb2202 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-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-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"
@@ -3163,12 +3163,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3178,15 +3178,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3194,151 +3214,150 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 3ff0b5e1a..e14d44270 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-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-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"
@@ -127,7 +127,7 @@ msgstr "copyright ¤Ź¤˘¤ę¤Ţ¤ť¤ó!\n"
 # build root [BuildRoot]
 # net share [ĽÍĽĂĽČśŚÍ­]
 # reloate [şĆÇŰĂÖ/°ÜĆ°¤š¤ë]
-# $Id: ja.po,v 1.75 2000/06/16 19:12:10 jbj Exp $
+# $Id: ja.po,v 1.76 2000/06/18 22:38:38 jbj Exp $
 #: rpm.c:177 rpmqv.c:256
 #, c-format
 msgid "rpm: %s\n"
@@ -3355,12 +3355,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3370,15 +3370,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "%s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n"
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3386,153 +3406,152 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "ĽěĽłĄźĽÉ %s ¤ÎźčĆŔ¤ÎĽ¨ĽéĄź (%s ¤Ť¤é)"
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "ĽěĽłĄźĽÉ %s ¤ň %s ¤ËĽšĽČĽ˘¤ÇĽ¨ĽéĄź "
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "ĽěĽłĄźĽÉ %s ¤ň %s ¤Ëşď˝ü¤ÇĽ¨ĽéĄź"
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "dbpath ¤ŹŔßÄꤾ¤ě¤Ć¤¤¤Ţ¤ť¤ó"
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ÎĂľş÷Ľ¨ĽéĄź\n"
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "¸Ąş÷¤Î¤ż¤á¤Î %d ¤Ç ĽŘĽĂĽŔ¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó"
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "ĽÇĄźĽżĽŮĄźĽšĽ¨ĽóĽČĽę¤ňşď˝ü¤ˇ¤Ţ¤š\n"
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "group Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n"
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "name Ľ¤ĽóĽÇĽĂĽŻĽšşď˝ü¤ˇ¤Ţ¤š\n"
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ÎĂľş÷Ľ¨ĽéĄź\n"
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "%s ¤ň %s ¤ŘĚžÁ°¤ňĘŃšš¤ˇ¤Ţ¤š\n"
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "rootdir %s Ăć¤ÇĽÇĄźĽżĽŮĄźĽš¤ňşĆš˝Ăۤˇ¤Ţ¤š\n"
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "°ěťţĹŞ¤ĘĽÇĄźĽżĽŮĄźĽš %s ¤Ď¤š¤Ç¤Ë¸şß¤ˇ¤Ć¤¤¤Ţ¤š"
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę %s ¤ÎşîŔŽĽ¨ĽéĄź: %s"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "¸Ĺ¤¤ĽÇĄźĽżĽŮĄźĽš¤ÎĽŞĄźĽ×Ľó\n"
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "żˇ¤ˇ¤¤ĽÇĄźĽżĽŮĄźĽš¤ÎĽŞĄźĽ×Ľó\n"
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "ĽÇĄźĽżĽŮĄźĽšĂć¤ÎĽěĽłĄźĽÉČÖšć %d ¤ĎÉÔŔľ¤Ç¤š -- ĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š"
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "%d ¤Ë ĽŞĽęĽ¸ĽĘĽë¤ÎĽěĽłĄźĽÉ¤ňÉղäǤ­¤Ţ¤ť¤ó"
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "ĽÇĄźĽżĽŮĄźĽš¤ÎşĆš˝Ăۤ˟şÇÔ; ĽŞĽęĽ¸ĽĘĽëĽÇĄźĽżĽŮĄźĽš¤Ź¤Ţ¤Ŕ¤˝¤ł¤ËťÄ¤Ă¤Ć¤¤¤Ţ¤š\n"
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr "¸Ĺ¤¤ĽÇĄźĽżĽŮĄźĽš¤ňżˇ¤ˇ¤¤ĽÇĄźĽżĽŮĄźĽš¤ËĂÖ¤­´š¤¨¤ë¤Î¤ËźşÇÔ!\n"
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "%s Ăć¤ÎĽŐĽĄĽ¤Ľë¤ňĽęĽŤĽĐĄź¤š¤ë¤ż¤á¤Ë %s ¤Ť¤éĽŐĽĄĽ¤Ľë¤ČĂÖ¤­´š¤¨¤Ţ¤š"
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę %s ¤Îşď˝üźşÇÔ: %s\n"
diff --git a/po/ko.po b/po/ko.po
index a4babcca4..772eb2202 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-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-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"
@@ -3163,12 +3163,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3178,15 +3178,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3194,151 +3214,150 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/no.po b/po/no.po
index a4babcca4..772eb2202 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-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-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"
@@ -3163,12 +3163,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3178,15 +3178,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3194,151 +3214,150 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 466d9e9a4..f005d373a 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-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-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"
@@ -3333,12 +3333,12 @@ msgstr ")"
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3348,15 +3348,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "nie można otworzyć %s\n"
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3364,36 +3384,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "błąd pobierania rekordu %s z %s"
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "błąd zapisywania rekordu %s do %s"
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "błąd usuwania rekordu %s z %s"
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "ścieżka bazy danych nie została podana"
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -3402,116 +3421,116 @@ msgstr ""
 "nowym formacie"
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "błąd szukania pakietu %s\n"
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "nie można odczytać nagłówka przy %d dla poszukiwania"
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "usuwanie wpisu w bazie\n"
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "usuwanie indeksu grupy\n"
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "usuwanie indeksu nazw\n"
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "błąd szukania pakietu %s\n"
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "zmiana nazwy %s na %s\n"
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "odbudowywuję bazę danych w rootdir %s\n"
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "tymczasowa baza danych %s już istnieje"
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "błąd przy tworzeniu katalogu %s: %s"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otwieranie starej bazy danych\n"
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otwieranie nowej bazy danych\n"
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "rekord numer %d w bazie danych jest błędny -- rekord pominięto"
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "nie można dodać rekordu oryginalnie przy %d"
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "przebudowanie bazy nie powiodło się; stara pozostała na miejscu\n"
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr "zamiana starej bazy na nową nie powiodła się!\n"
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "naprawcze zastępowanie plików w %s plikami z %s"
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "usunięcie katalogu %s nie powiodło się: %s\n"
diff --git a/po/pt.po b/po/pt.po
index a4babcca4..772eb2202 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-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-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"
@@ -3163,12 +3163,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3178,15 +3178,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3194,151 +3214,150 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d133d4d75..99169de5b 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-16 14:54-0400\n"
+msgstr "POT-Creation-Date: 2000-06-18 18:37-0400\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:422
 #, c-format
@@ -3482,12 +3482,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3498,15 +3498,35 @@ msgid ""
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "Năo consegui abrir: %s\n"
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3514,146 +3534,145 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "Năo consegui abrir: %s\n"
 
 # , c-format
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "Năo consegui abrir: %s\n"
 
 # , c-format
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "Năo consegui abrir: %s\n"
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "năo foi passado pacote para instalaçăo"
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "năo foi passado pacote para desinstalaçăo"
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "Năo consegui abrir: %s\n"
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "Năo consegui abrir: %s\n"
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
@@ -3666,13 +3685,13 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "RPM versăo %s\n"
 
 # , c-format
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Năo consegui abrir: %s\n"
diff --git a/po/ro.po b/po/ro.po
index f99f1ba8d..4ce9d3921 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-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-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"
@@ -3158,12 +3158,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3173,15 +3173,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3189,151 +3209,150 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index a4babcca4..772eb2202 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-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-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"
@@ -3163,12 +3163,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3178,15 +3178,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3194,151 +3214,150 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index c2f03f0d5..1bb635330 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-06-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-0400\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3333,12 +3333,12 @@ msgstr ")"
 msgid "OK"
 msgstr "Ok"
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3348,15 +3348,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "ÎĹ ÍĎÇŐ ĎÔËŇŮÔŘ %s\n"
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3364,36 +3384,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "ĎŰÉÂËÁ ĐĎĚŐŢĹÎÉŃ ÚÁĐÉÓÉ %s ÉÚ %s"
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "ĎŰÉÂËÁ ÓĎČŇÁÎĹÎÉŃ ÚÁĐÉÓÉ %s × %s"
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "ĎŰÉÂËÁ ŐÄÁĚĹÎÉŃ ÚÁĐÉÓÉ %s ÉÚ %s"
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "ÎĹ ŐÓÔÁÎĎ×ĚĹÎÁ dbpath"
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -3402,116 +3421,116 @@ msgstr ""
 "ÂÁÚŮ ÎĎ×ĎÇĎ ĆĎŇÍÁÔÁ"
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "ĎŰÉÂËÁ ĐŇÉ ĐĎÉÓËĹ ĐÁËĹÔÁ %s\n"
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "ÎĹ ÍĎÇŐ ĐŇĎŢĹÓÔŘ ČĹÄĹŇ × %d ÄĚŃ ĐĎÉÓËÁ"
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "ŐÄÁĚŃŔ ÚÁĐÉÓŘ ÂÁÚŮ ÄÁÎÎŮČ\n"
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "ŐÄÁĚŃŔ ÉÎÄĹËÓ ÇŇŐĐĐ\n"
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "ŐÄÁĚŃŔ ÉÎÄĹËÓ ÉÍĹÎ\n"
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "ĎŰÉÂËÁ ĐŇÉ ĐĎÉÓËĹ ĐÁËĹÔÁ %s\n"
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "ĐĹŇĹÉÍĹÎĎ×Ů×ÁŔ %s × %s\n"
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "ĐĹŇĹÓÔŇÁÉ×ÁŔ ÂÁÚŐ × ËĎŇÎĹ×ĎÍ ËÁÔÁĚĎÇĹ %s\n"
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "×ŇĹÍĹÎÎÁŃ ÂÁÚÁ ÄÁÎÎŮČ %s ŐÖĹ ÓŐÝĹÓÔ×ŐĹÔ"
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "ÓĎÚÄÁŔ ËÁÔÁĚĎÇ: %s\n"
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "ĎŰÉÂËÁ ÓĎÚÄÁÎÉŃ ËÁÔÁĚĎÇÁ %s: %s"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "ĎÔËŇŮ×ÁŔ ÓÔÁŇŐŔ ÂÁÚŐ\n"
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "ĎÔËŇŮ×ÁŔ ÎĎ×ŐŔ ÂÁÚŐ\n"
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "ÚÁĐÉÓŘ ÎĎÍĹŇ %d × ÂÁÚĹ ÎĹ×ĹŇÎÁ, ĐŇĎĐŐÓËÁŔ"
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "ÎĹ ÍĎÇŐ ÄĎÂÁ×ÉÔŘ ÚÁĐÉÓŘ (ĐĹŇ×ĎÎÁŢÁĚŘÎĎ × %d)"
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "ĐĹŇĹÓÔŇĎĹÎÉĹ ÂÁÚŮ ÎĹ ŐÄÁĚĎÓŘ, ÓÔÁŇÁŃ ÂÁÚÁ ĎÓÔÁĹÔÓŃ ÎÁ ÍĹÓÔĹ\n"
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr "ÚÁÍĹÎÁ ÓÔÁŇĎĘ ÂÁÚŮ ÎÁ ÎĎ×ŐŔ ÎĹ ŐÄÁĚÁÓŘ!\n"
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "ÄĚŃ ×ĎÓÓÔÁÎĎ×ĚĹÎÉŃ ÚÁÍĹÎŃĹÔ ĆÁĘĚŮ × %s ĆÁĘĚÁÍÉ ÉÚ %s"
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "ÓĎÚÄÁŔ ËÁÔÁĚĎÇ: %s\n"
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "ŐÄÁĚĹÎÉĹ ËÁÔÁĚĎÇÁ %s ÎĹ ŐÄÁĚĎÓŘ: %s\n"
diff --git a/po/sk.po b/po/sk.po
index c46e6ed38..868bfed4e 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-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-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"
@@ -3340,12 +3340,12 @@ msgstr ")"
 msgid "OK"
 msgstr "V PORIADKU"
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3355,15 +3355,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "nie je možné otvoriť %s\n"
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3371,36 +3391,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "chyba pri načítaní záznamu %s z %s"
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "chyba pri zápise záznamu %s do %s"
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "chyba pri odstraňovaní záznamu %s z %s"
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "nebola nastavená žiadna dbpath"
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -3409,116 +3428,116 @@ msgstr ""
 "databázy v novom formáte"
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "chyba pri hľadaní balíka %s\n"
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "nie je možné prečítať hlavičku na %d pre vyhľadanie"
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "odstraňuje sa záznam z databázy\n"
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstraňuje sa index skupín\n"
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "odstraňuje sa index názvov\n"
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "chyba pri hľadaní balíka %s\n"
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "premenováva sa %s na %s\n"
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "znovu sa vytvára databáza v adresári %s\n"
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "dočasná databáza %s už existuje"
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "chyba pri vytváraní adresára %s: %s"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otvára sa stará databáza\n"
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otvára sa nová databáza\n"
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "záznam číslo %d v databáze je chybný -- bol vynechaný"
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "nie je možné pridať záznam pôvodne na %d"
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "nepodarilo sa znovu vytvoriť databázu; zostáva pôvodná\n"
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr "nepodarilo sa nahradiť starú databázu novou!\n"
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "nahradí súbory v %s súbormi z %s kvôli obnove"
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "nepodarilo sa odstrániť adresár %s: %s\n"
diff --git a/po/sl.po b/po/sl.po
index abfe55c7b..4bebc4b59 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.60 2000/06/16 19:12:11 jbj Exp $
+# $Id: sl.po,v 1.61 2000/06/18 22:38:39 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-06-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-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"
@@ -3325,12 +3325,12 @@ msgstr ")"
 msgid "OK"
 msgstr "V REDU"
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3340,15 +3340,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "ni možno odpreti %s: %s\n"
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3356,153 +3376,152 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "napaka pri branju zapisa %s iz %s"
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "napaka pri pisanju zapisa %s v %s"
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "napaka pri brisanju zapisa %s iz %s"
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "dbpath ni nastavljena"
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr "staro obliko podatkove zbirke pretvorite v novo z --rebuilddb"
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "napaka pri iskanju paketa %s\n"
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "ni možno prebrati glave pri %d za vpogled"
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "odstranjujemo vnose v podatkovni zbirki\n"
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstranjujemo seznam skupin\n"
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "odstranjujemo seznam imen\n"
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "napaka pri iskanju paketa %s\n"
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "preimenujemo %s v %s\n"
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n"
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "začasna podatkovna zbirka %s že obstaja"
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "ustvarjamo imenik: %s\n"
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "napaka pri ustvarjanju imenika %s: %s"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "odpiramo staro podatkovno zbirko\n"
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "odpiramo novo podatkovno zbirko\n"
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "zapis št. %d v zbirki je okvarjen -- preskakujemo."
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "zapisa ni možno dodati na %d"
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "ponovna izgradnja podatkovne zbirke neuspešna; stara ostaja na istem mestu\n"
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr "zamenjava stare podatkovne zbirke z novo neuspešna!\n"
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "poskušamo povrniti z nadomestitvijo datotek v %s z datotekami iz %s"
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "ustvarjamo imenik: %s\n"
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspešna odstranitev imenika %s: %s\n"
diff --git a/po/sr.po b/po/sr.po
index 1082593d0..959655d8b 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-06-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-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"
@@ -3360,12 +3360,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3375,15 +3375,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "greška: ne mogu da otvorim %s\n"
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3391,151 +3411,150 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "greška kod uzimanja sloga %s iz %s"
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "greška zapisivanja sloga %s u %s"
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "greška uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "dbpath nije određen"
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "greška kod potrage za paketom %s\n"
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "ne mogu da pročitam zaglavlje na %d za proveru"
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "greška uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "greška uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "greška kod potrage za paketom %s\n"
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "rekreiraj bazu podataka iz postojeće baze"
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "privremena baza podataka %s već postoji"
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "rekreiraj bazu podataka iz postojeće baze"
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "rekreiraj bazu podataka iz postojeće baze"
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "slog broj %d u bazi podataka je neispravan -- preskačem ga"
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "ne mogu da dodam slog originalno na %d"
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
diff --git a/po/sv.po b/po/sv.po
index 92df02250..7674eb558 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.120 $
+# $Revision: 1.121 $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-06-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-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"
@@ -3312,12 +3312,12 @@ msgstr ")"
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3327,15 +3327,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "kan inte öppna %s: %s\n"
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3343,36 +3363,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "fel när post %s hämtades frĺn %s"
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "fel när post %s sparades i %s"
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "fel när post %s togs bort ur %s"
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "ingen dbpath har satts"
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -3381,116 +3400,116 @@ msgstr ""
 "i nytt format"
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "fel vid sökning efter paket %s\n"
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "kan inte läsa huvud vid %d för uppslagning"
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "tar bort databasposter\n"
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "tar bort gruppindex\n"
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "tar bort namnindex\n"
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "fel vid sökning efter paket %s\n"
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "byter namn pĺ %s till %s\n"
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "bygger om databas %s till %s\n"
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "tillfällig databas %s existerar redan"
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "skapar katalog: %s\n"
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "fel när katalog skapades %s: %s"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "öppnar gammal databas\n"
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "öppnar ny databas\n"
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "post nummer %d i databasen är felaktig -- hoppar över den"
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "kan inte lägga till post ursprungligen vid %d"
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "kunde inte bygga om databasen; orginaldatabasen finns kvar\n"
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr "kunde inte ersätta gammal databas med ny databas!\n"
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "byt ut filer i %s med filer frĺn %s för att ĺterställa"
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "skapar katalog: %s\n"
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunde inte ta bort katalogen %s: %s\n"
diff --git a/po/tr.po b/po/tr.po
index d067b0652..b450f8c63 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-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-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"
@@ -3413,12 +3413,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3428,15 +3428,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "hata: %s eriţilemiyor\n"
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3444,151 +3464,150 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "%s kaydýna %s dosyasýnda eriţilemiyor:"
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "%s kaydý %s dosyasýna yazýlamýyor"
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "dbpath deđeri girilmemiţ"
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "%s pakedi aranýrken hata oluţtu\n"
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "%d kaydýndan baţlýk bilgisi okunamadý"
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "%s pakedi aranýrken hata oluţtu\n"
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluţturur"
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "geçici veritabaný %s mevcut"
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "%s dizinin oluţturulmasýnda hata: %s"
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "%s dizinin oluţturulmasýnda hata: %s"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluţturur"
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluţturur"
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "veritabanýndaki %d numaralý kayýt hatalý -- atlanýyor"
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "%d de yer alan kayýt saklayamýyor"
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "%s dizinin oluţturulmasýnda hata: %s"
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "%s açýlamadý: %s"
diff --git a/po/uk.po b/po/uk.po
index a4babcca4..772eb2202 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-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-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"
@@ -3163,12 +3163,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3178,15 +3178,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3194,151 +3214,150 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/rpm.spec b/rpm.spec
index 07d6d36d4..2af7a09f1 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -5,7 +5,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 4.0
 Version: %{version}
-Release: 0.38
+Release: 0.39
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
 Copyright: GPL
@@ -255,6 +255,9 @@ fi
 %{__prefix}/include/popt.h
 
 %changelog
+* Sun Jun 18 2000 Jeff Johnson <jbj@redhat.com>
+- require --rebuilddb to convert db1 -> db3, better messages.
+
 * Fri Jun 16 2000 Jeff Johnson <jbj@redhat.com>
 - fix: resurrect symlink unique'ifying property of finger prints.