- fix: make set of replaced file headers unique.

- fix: don't attempt dbiOpen with anything but requested dbN.

CVS patchset: 3952
CVS date: 2000/07/15 16:00:14

26 files changed, 1471 insertions, 1698 deletions

diff --git a/po/cs.po b/po/cs.po
index 1a0a62634..94507d974 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-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-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"
@@ -2627,7 +2627,7 @@ msgstr "soubor %s je na neznámém zařízení"
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "Počet RPM_STRING_TYPE pro grabData() musí být 1.\n"
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datový typ %d není podporován\n"
@@ -2698,111 +2698,111 @@ msgstr "na konci výrazu se očekávala |"
 msgid "(unknown type)"
 msgstr "(neznámý typ)"
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, fuzzy, c-format
 msgid "   file: %s action: %s\n"
 msgstr "soubor %s: %s\n"
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "probíhá instalace binárních balíčků\n"
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "nelze otevřít soubor %s: "
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "nelze otevřít soubor %s: "
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "nelze otevřít soubor %s: "
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, fuzzy, c-format
 msgid "spec file in: %s\n"
 msgstr "soubor %s: %s\n"
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "balíček %s neobsahuje soubory"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, fuzzy, c-format
 msgid "renaming %s to %s\n"
 msgstr "Probíhá získávání %s jako %s\n"
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "%s nelze přejmenovat na %s: %s"
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "balíček %s-%s-%s obsahuje sdílení soubory\n"
 
-#: lib/install.c:950
+#: lib/install.c:964
 #, fuzzy
 msgid "stopping install as we're running --test\n"
 msgstr "probíhá zastavení zdrojové instalace, neboť jde jen o testování\n"
 
-#: lib/install.c:955
+#: lib/install.c:969
 #, fuzzy
 msgid "running preinstall script (if any)\n"
 msgstr "spouští se případný poinstalační skript\n"
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 #, fuzzy
 msgid "running postinstall scripts (if any)\n"
 msgstr "spouští se případný poinstalační skript\n"
@@ -3310,22 +3310,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "chyba: nelze otevřít %s\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3335,7 +3335,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3346,146 +3346,137 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, 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:541
+#: lib/rpmdb.c:515
 #, 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:550
+#: lib/rpmdb.c:524
 #, 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:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "nebyla nastavena dbpath"
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "chyba při hledání balíčku %s\n"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "nelze číst hlavičku u %d pro vyhledání"
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "odstraňuje se položka databáze\n"
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstraňuje se rejstřík skupin\n"
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "odstraňuje se rejstřík názvů\n"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "chyba při hledání balíčku %s\n"
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "Probíhá získávání %s jako %s\n"
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: 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:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "dočasná databáze %s již existuje"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "vytváří se adresář: %s\n"
 
-#: lib/rpmdb.c:2342
+#: 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:2349
+#: 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:2358
+#: 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:2381
+#: 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:2413
+#: 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:2431
+#: 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:2439
+#: 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:2441
+#: 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:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "vytváří se adresář: %s\n"
 
-#: lib/rpmdb.c:2453
+#: 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 cb5846b1f..fdf03839d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
@@ -2472,7 +2472,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2543,107 +2543,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3115,22 +3115,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3140,7 +3140,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3151,145 +3151,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: 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 d17ffc861..d7ea44b27 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-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-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"
@@ -2723,7 +2723,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2798,111 +2798,111 @@ msgid "(unknown type)"
 msgstr "(unbekannter Typ)"
 
 # , c-format
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, fuzzy, c-format
 msgid "   file: %s action: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "Paket installieren"
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "kann Datei %s nicht öffnen: "
 
 # , c-format
-#: lib/install.c:662
+#: lib/install.c:676
 #, fuzzy, c-format
 msgid "spec file in: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "umbennen von %s nach %s fehlgeschlagen: %s"
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
 # FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/install.c:890
+#: lib/install.c:904
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3418,22 +3418,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "Fehler: kann %s nicht öffnen\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3443,7 +3443,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3454,150 +3454,141 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "Fehler beim Eintrag %s von %s"
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
 
 # FIXME
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "ťdbpathŤ ist nicht gesetzt"
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, 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:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
 # FIXME
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
 # FIXME
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "die temporäre Datenbank %s existiert schon"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpmdb.c:2349
+#: 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:2358
+#: 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:2381
+#: 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:2413
+#: 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:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: 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:2453
+#: 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 35f075016..282bbe2c9 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-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-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"
@@ -2457,7 +2457,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2528,107 +2528,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3100,22 +3100,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3125,7 +3125,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3136,145 +3136,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: 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 0da3fc53d..8dd753d6f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -2659,7 +2659,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2732,109 +2732,109 @@ msgstr "odotin '}'-merkkiä ilmauksen lopussa"
 msgid "(unknown type)"
 msgstr "(tuntematon tyyppi)"
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, fuzzy, c-format
 msgid "   file: %s action: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "asenna paketti"
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, fuzzy, c-format
 msgid "spec file in: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "%s:n nimeäminen %s:ksi epäonnistui: %s"
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3342,22 +3342,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "virhe: en voi avata %s\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3367,7 +3367,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3378,145 +3378,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "virhe luettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "virhe talletettaessa tietuetta %s %s:ään"
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "dbpath ei ole asetettu"
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "en voi lukea headeria %d:stä päivittäessä"
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "väliaikainen tietokanta %s on jo olemassa"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:2381
+#: 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:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "en voi lisätä tietuetta %d:stä"
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpmdb.c:2453
+#: 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 695e64dce..296a437e8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-07-15 10:39-0400\n"
+msgstr "POT-Creation-Date: 2000-07-15 11:53-0400\n"
 
 #: build.c:25 lib/rpminstall.c:451
 #, c-format
@@ -2652,7 +2652,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2725,109 +2725,109 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr ""
 "        -f <file>+        - interroge le package ŕ qui appartient <file>"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3334,22 +3334,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3359,7 +3359,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3370,145 +3370,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, 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:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:2453
+#: 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 35f075016..282bbe2c9 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-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-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"
@@ -2457,7 +2457,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2528,107 +2528,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3100,22 +3100,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3125,7 +3125,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3136,145 +3136,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: 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 35f075016..282bbe2c9 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-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-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"
@@ -2457,7 +2457,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2528,107 +2528,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3100,22 +3100,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3125,7 +3125,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3136,145 +3136,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: 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 35f075016..282bbe2c9 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-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-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"
@@ -2457,7 +2457,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2528,107 +2528,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3100,22 +3100,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3125,7 +3125,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3136,145 +3136,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: 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 f5618d4d7..88d6266cf 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-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-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"
@@ -2452,7 +2452,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2523,107 +2523,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3095,22 +3095,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3120,7 +3120,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3131,145 +3131,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: 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 35f075016..282bbe2c9 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-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-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"
@@ -2457,7 +2457,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2528,107 +2528,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3100,22 +3100,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3125,7 +3125,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3136,145 +3136,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: 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 85be298ed..2eec04b3a 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-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-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.94 2000/07/15 14:53:57 jbj Exp $
+# $Id: ja.po,v 1.95 2000/07/15 16:00:15 jbj Exp $
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2606,7 +2606,7 @@ msgstr "ĽŐĽĄĽ¤Ľë %s ¤ĎÉÔĚŔ¤ĘĽÇĽĐĽ¤Ľš¤Ç¤š"
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabDate() RPM_STRING_TYPE ĽŤĽŚĽóĽČ¤Ď 1 ¤Ç¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤óĄŁ\n"
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "ĽÇĄźĽżĽżĽ¤Ľ× %d ¤ĎĽľĽÝĄźĽČ¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó\n"
@@ -2677,22 +2677,22 @@ msgstr "ź°¤Î˝Ş¤ę¤Ë | ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
 msgid "(unknown type)"
 msgstr "(ÉÔĚŔ¤ĘĽżĽ¤Ľ×)"
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, fuzzy, c-format
 msgid "   file: %s action: %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s: Ľ˘ĽŻĽˇĽçĽó: %s\n"
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr "ĽćĄźĽś %s ¤Ď¸şß¤ˇ¤Ţ¤ť¤ó - root ¤ňťČÍѤˇ¤Ţ¤š"
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr "Ľ°ĽëĄźĽ× %s ¤Ď¸şß¤ˇ¤Ţ¤ť¤ó - root ¤ňťČÍѤˇ¤Ţ¤š"
 
-#: lib/install.c:204
+#: lib/install.c:205
 #, fuzzy
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
@@ -2701,87 +2701,87 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "ĽŐĽĄĽ¤Ľë %s ¤ÎĽ˘ĄźĽŤĽ¤ĽÖ¤Îż­Äš¤ËźşÇÔ %s%s: %s"
 
-#: lib/install.c:558
+#: lib/install.c:572
 #, fuzzy
 msgid " on file "
 msgstr "ĽŐĽĄĽ¤Ľëžĺ"
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ć¤¤¤Ţ¤š\n"
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "%s ¤ňşîŔŽ¤Ç¤­¤Ţ¤ť¤ó: %s"
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr "%s ¤Ř˝ń¤­šţ¤á¤Ţ¤ť¤ó"
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr "Ľ˝ĄźĽš¤Ď: %s\n"
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "%s ¤ňşîŔŽ¤Ç¤­¤Ţ¤ť¤ó: %s"
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "spec ĽŐĽĄĽ¤Ľë¤Ď: %s\n"
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤Ď .spec ĽŐĽĄĽ¤Ľë¤ň´Ţ¤ó¤Ç¤¤¤Ţ¤ť¤ó"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "%s ¤ň %s ¤ŘĚžÁ°¤ňĘŃšš¤ˇ¤Ţ¤š\n"
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "%s ¤ň %s ¤Ë¤š¤ëĚžÁ°¤ÎĘŃšš¤ËźşÇÔ: %s"
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤Ź´üÂÔ¤ľ¤ě¤Ţ¤šĄ˘ĽĐĽ¤ĽĘĽę¤Ď¸Ť¤Ä¤Ť¤ę¤Ţ¤ˇ¤ż"
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸: %s-%s-%s ĽŐĽĄĽ¤ĽëĽĆĽšĽČ = %d\n"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr "--test ¤ňźÂšÔ¤š¤ë¤č¤Ś¤ËĽ¤ĽóĽšĽČĄźĽë¤ňĂćťß¤ˇ¤Ć¤¤¤Ţ¤š\n"
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr "Ľ×ĽęĽ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ(¤ŹÍ­¤ě¤Đ)¤ňźÂšÔ¤ˇ¤Ţ¤š\n"
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "ˇŮšđ: %s ¤Ď %s ¤Č¤ˇ¤ĆşîŔŽ¤ľ¤ě¤Ţ¤š"
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "ˇŮšđ: %s ¤Ď %s ¤Č¤ˇ¤ĆĘݸ¤ľ¤ě¤Ţ¤š"
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 #, fuzzy
 msgid "running postinstall scripts (if any)\n"
 msgstr "ĽÝĽšĽČĽ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ(¤ŹÍ­¤ě¤Đ)¤ňźÂšÔ¤ˇ¤Ţ¤š\n"
@@ -3296,22 +3296,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "%s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3321,7 +3321,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3332,147 +3332,138 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "ĽěĽłĄźĽÉ %s ¤ÎźčĆŔ¤ÎĽ¨ĽéĄź (%s ¤Ť¤é)"
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "ĽěĽłĄźĽÉ %s ¤ň %s ¤ËĽšĽČĽ˘¤ÇĽ¨ĽéĄź "
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "ĽěĽłĄźĽÉ %s ¤ň %s ¤Ëşď˝ü¤ÇĽ¨ĽéĄź"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "dbpath ¤ŹŔßÄꤾ¤ě¤Ć¤¤¤Ţ¤ť¤ó"
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ÎĂľş÷Ľ¨ĽéĄź\n"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "¸Ąş÷¤Î¤ż¤á¤Î %d ¤Ç ĽŘĽĂĽŔ¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó"
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "ĽÇĄźĽżĽŮĄźĽšĽ¨ĽóĽČĽę¤ňşď˝ü¤ˇ¤Ţ¤š\n"
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "group Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n"
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "name Ľ¤ĽóĽÇĽĂĽŻĽšşď˝ü¤ˇ¤Ţ¤š\n"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ÎĂľş÷Ľ¨ĽéĄź\n"
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "%s ¤ň %s ¤ŘĚžÁ°¤ňĘŃšš¤ˇ¤Ţ¤š\n"
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "rootdir %s Ăć¤ÇĽÇĄźĽżĽŮĄźĽš¤ňşĆš˝Ăۤˇ¤Ţ¤š\n"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "°ěťţĹŞ¤ĘĽÇĄźĽżĽŮĄźĽš %s ¤Ď¤š¤Ç¤Ë¸şß¤ˇ¤Ć¤¤¤Ţ¤š"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę %s ¤ÎşîŔŽĽ¨ĽéĄź: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "¸Ĺ¤¤ĽÇĄźĽżĽŮĄźĽš¤ÎĽŞĄźĽ×Ľó\n"
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "żˇ¤ˇ¤¤ĽÇĄźĽżĽŮĄźĽš¤ÎĽŞĄźĽ×Ľó\n"
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "ĽÇĄźĽżĽŮĄźĽšĂć¤ÎĽěĽłĄźĽÉČÖšć %d ¤ĎÉÔŔľ¤Ç¤š -- ĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š"
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "%d ¤Ë ĽŞĽęĽ¸ĽĘĽë¤ÎĽěĽłĄźĽÉ¤ňÉղäǤ­¤Ţ¤ť¤ó"
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "ĽÇĄźĽżĽŮĄźĽš¤ÎşĆš˝Ăۤ˟şÇÔ; ĽŞĽęĽ¸ĽĘĽëĽÇĄźĽżĽŮĄźĽš¤Ź¤Ţ¤Ŕ¤˝¤ł¤ËťÄ¤Ă¤Ć¤¤¤Ţ¤š\n"
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr "¸Ĺ¤¤ĽÇĄźĽżĽŮĄźĽš¤ňżˇ¤ˇ¤¤ĽÇĄźĽżĽŮĄźĽš¤ËĂÖ¤­´š¤¨¤ë¤Î¤ËźşÇÔ!\n"
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "%s Ăć¤ÎĽŐĽĄĽ¤Ľë¤ňĽęĽŤĽĐĄź¤š¤ë¤ż¤á¤Ë %s ¤Ť¤éĽŐĽĄĽ¤Ľë¤ČĂÖ¤­´š¤¨¤Ţ¤š"
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
 
-#: lib/rpmdb.c:2453
+#: 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 35f075016..282bbe2c9 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-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-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"
@@ -2457,7 +2457,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2528,107 +2528,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3100,22 +3100,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3125,7 +3125,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3136,145 +3136,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: 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 9f80af686..c591960ad 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: 2000-06-22 21:59+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -2482,7 +2482,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2553,107 +2553,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3125,22 +3125,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3150,7 +3150,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3161,145 +3161,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: 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 b60977190..5a9bec8dd 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-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-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"
@@ -2602,7 +2602,7 @@ msgstr "plik %s jest na nieznanym urządzeniu"
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE licznik musi być 1.\n"
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Typ danych %d nie jest obsługiwany\n"
@@ -2673,107 +2673,107 @@ msgstr "spodziewany | na końcu wyrażenia"
 msgid "(unknown type)"
 msgstr "(nieznany typ)"
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr "   plik: %s akcja: %s\n"
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr "użytkownik %s nie istnieje - użyto konta root"
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr "grupa %s nie istnieje - użyto grupy root"
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr "wartość %%instchangelog w pliku makra powinna być liczbą, a nie jest"
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "rozpakowanie archiwum nie powiodło się %s%s: %s"
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr " na pliku "
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr "instacja pakietu źródłowego\n"
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "nie można utworzyć %s"
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr "nie można zapisać do %s"
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr "źródła w: %s\n"
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "nie można utworzyć %s"
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "plik spec w: %s\n"
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr "pakiet źródłowy nie zawiera pliku .spec"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "zmiana nazwy %s na %s\n"
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "zmiana nazwy z %s na %s nie powiodła sie: %s"
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr "spodziewany pakiet źródłowy a nie binarny"
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "pakiet: %s-%s-%s test plików = %d\n"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr "przebieg testowy - instalacja zatrzymana\n"
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr "uruchamianie skryptu preinstall (jeśli istnieje)\n"
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "ostrzeżenie: %s utworzony jako %s"
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "ostrzeżenie: %s zapisany jako %s"
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 #, fuzzy
 msgid "running postinstall scripts (if any)\n"
 msgstr "uruchamianie skryptu postinstall (jeśli istnieje)\n"
@@ -3268,22 +3268,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "nie można otworzyć %s\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3293,7 +3293,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3304,35 +3304,26 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "błąd pobierania rekordu %s z %s"
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "błąd zapisywania rekordu %s do %s"
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "błąd usuwania rekordu %s z %s"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "ścieżka bazy danych nie została podana"
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -3341,111 +3332,111 @@ msgstr ""
 "nowym formacie"
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "błąd szukania pakietu %s\n"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, 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:1727
+#: lib/rpmdb.c:1701
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "usuwanie wpisu w bazie\n"
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "usuwanie indeksu grupy\n"
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "usuwanie indeksu nazw\n"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "błąd szukania pakietu %s\n"
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "zmiana nazwy %s na %s\n"
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: 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:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "tymczasowa baza danych %s już istnieje"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "błąd przy tworzeniu katalogu %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otwieranie starej bazy danych\n"
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otwieranie nowej bazy danych\n"
 
-#: lib/rpmdb.c:2381
+#: 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:2413
+#: 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:2431
+#: 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:2439
+#: 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:2441
+#: 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:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: lib/rpmdb.c:2453
+#: 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 35f075016..282bbe2c9 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-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-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"
@@ -2457,7 +2457,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2528,107 +2528,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3100,22 +3100,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3125,7 +3125,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3136,145 +3136,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: 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 95d9eaea5..e9452fee5 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-07-15 10:39-0400\n"
+msgstr "POT-Creation-Date: 2000-07-15 11:53-0400\n"
 
 #: build.c:25 lib/rpminstall.c:451
 #, c-format
@@ -2723,7 +2723,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2796,112 +2796,112 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "instale pacote"
 
 # , c-format
-#: lib/install.c:622
+#: lib/install.c:636
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "Năo consegui abrir: %s\n"
 
 # , c-format
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "Năo consegui abrir: %s\n"
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
 # , c-format
-#: lib/install.c:652
+#: lib/install.c:666
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "Năo consegui abrir: %s\n"
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "năo foi passado pacote para instalaçăo"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3409,22 +3409,22 @@ msgid ""
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "Năo consegui abrir: %s\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3434,7 +3434,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3445,140 +3445,131 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "Năo consegui abrir: %s\n"
 
 # , c-format
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "Năo consegui abrir: %s\n"
 
 # , c-format
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "Năo consegui abrir: %s\n"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "năo foi passado pacote para instalaçăo"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "năo foi passado pacote para desinstalaçăo"
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "Năo consegui abrir: %s\n"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: 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:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "Năo consegui abrir: %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: 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:2358
+#: 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:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
@@ -3591,13 +3582,13 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "RPM versăo %s\n"
 
 # , c-format
-#: lib/rpmdb.c:2453
+#: 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 f9c943e45..459c1ed1d 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-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-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"
@@ -2452,7 +2452,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2523,107 +2523,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3095,22 +3095,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3120,7 +3120,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3131,145 +3131,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: 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 35f075016..282bbe2c9 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-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-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"
@@ -2457,7 +2457,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2528,107 +2528,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3100,22 +3100,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3125,7 +3125,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3136,145 +3136,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: 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 c2289bc86..435d64d1c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2606,7 +2606,7 @@ msgstr "ĆÁĘĚ %s - ÎÁ ÎĹÉÚ×ĹÓÔÎĎÍ ŐÓÔŇĎĘÓÔ×Ĺ"
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE count must be 1.\n"
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "ôÉĐ ÄÁÎÎŮČ %d ÎĹ ĐĎÄÄĹŇÖÉ×ÁĹÔÓŃ\n"
@@ -2677,107 +2677,107 @@ msgstr "× ËĎÎĂĹ ×ŮŇÁÖĹÎÉŃ ĎÖÉÄÁĚÓŃ \"|\""
 msgid "(unknown type)"
 msgstr "(ÎĹÉÚ×ĹÓÔÎŮĘ ÔÉĐ)"
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr "ĆÁĘĚ : %s ÄĹĘÓÔ×ÉĹ: %s\n"
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr "ĐĎĚŘÚĎ×ÁÔĹĚŘ %s ÎĹ ÓŐÝĹÓÔ×ŐĹÔ, ÉÓĐĎĚŘÚŐŔ root"
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr "ÇŇŐĐĐÁ %s ÎĹ ÓŐÝĹÓÔ×ŐĹÔ, ÉÓĐĎĚŘÚŐŔ root"
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr "ÚÎÁŢĹÎÉĹ %%instchangelog × ÍÁËŇĎĆÁĘĚĹ ÄĎĚÖÎĎ ÂŮÔŘ ŢÉÓĚĎÍ, Á ĎÎĎ ÎĹÔ..."
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "ŇÁÓĐÁËĎ×ËÁ ÁŇČÉ×Á ÎĹ ŐÄÁĚÁÓŘ%s%s: %s"
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr " ÎÁ ĆÁĘĚĹ "
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr "ŐÓÔÁÎÁ×ĚÉ×ÁŔ ÉÓČĎÄÎŮĘ ĐÁËĹÔ\n"
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "ÎĹ ÍĎÇŐ ÓĎÚÄÁÔŘ %s"
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr "ÎĹ ÍĎÇŐ ĐÉÓÁÔŘ × %s"
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr "ÉÓČĎÄÎÉËÉ ×: %s\n"
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "ÎĹ ÍĎÇŐ ÓĎÚÄÁÔŘ %s"
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "ĆÁĘĚ spec ×: %s\n"
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr "ÉÓČĎÄÎŮĘ ĐÁËĹÔ ÎĹ ÓĎÄĹŇÖÉÔ ĆÁĘĚÁ .spec"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "ĐĹŇĹÉÍĹÎĎ×Ů×ÁŔ %s × %s\n"
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "ĎŰÉÂËÁ ĐĹŇĹÉÍĹÎĎ×ÁÎÉŃ %s × %s: %s"
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr "ĎÖÉÄÁĚÓŃ ÉÓČĎÄÎŮĘ ĐÁËĹÔ, ÎÁĘÄĹÎ ÂÉÎÁŇÎŮĘ"
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "ĐÁËĹÔ: %s-%s-%s ĆÁĘĚĎ×; test = %d\n"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr "ĎÓÔÁÎÁ×ĚÉ×ÁŔ ŐÓÔÁÎĎ×ËŐ, Ô.Ë. ÍŮ ÉÓĐĎĚÎŃĹÍ --test\n"
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr "ÉÓĐĎĚÎŃŔ ÓËŇÉĐÔ preinstall (ĹÓĚÉ ĹÓÔŘ)\n"
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "ĐŇĹÄŐĐŇĹÖÄĹÎÉĹ: %s ÓĎÚÄÁÎ ËÁË %s"
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "ĐŇĹÄŐĐŇĹÖÄĹÎÉĹ: %s ÓĎČŇÁÎĹÎ ËÁË %s"
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 #, fuzzy
 msgid "running postinstall scripts (if any)\n"
 msgstr "ÉÓĐĎĚÎŃŔ ÓËŇÉĐÔ postinstall (ĹÓĚÉ ĹÓÔŘ)\n"
@@ -3268,22 +3268,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "ÎĹ ÍĎÇŐ ĎÔËŇŮÔŘ %s\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3293,7 +3293,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3304,35 +3304,26 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "ĎŰÉÂËÁ ĐĎĚŐŢĹÎÉŃ ÚÁĐÉÓÉ %s ÉÚ %s"
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "ĎŰÉÂËÁ ÓĎČŇÁÎĹÎÉŃ ÚÁĐÉÓÉ %s × %s"
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "ĎŰÉÂËÁ ŐÄÁĚĹÎÉŃ ÚÁĐÉÓÉ %s ÉÚ %s"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "ÎĹ ŐÓÔÁÎĎ×ĚĹÎÁ dbpath"
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -3341,111 +3332,111 @@ msgstr ""
 "ÂÁÚŮ ÎĎ×ĎÇĎ ĆĎŇÍÁÔÁ"
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "ĎŰÉÂËÁ ĐŇÉ ĐĎÉÓËĹ ĐÁËĹÔÁ %s\n"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "ÎĹ ÍĎÇŐ ĐŇĎŢĹÓÔŘ ČĹÄĹŇ × %d ÄĚŃ ĐĎÉÓËÁ"
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "ŐÄÁĚŃŔ ÚÁĐÉÓŘ ÂÁÚŮ ÄÁÎÎŮČ\n"
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "ŐÄÁĚŃŔ ÉÎÄĹËÓ ÇŇŐĐĐ\n"
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "ŐÄÁĚŃŔ ÉÎÄĹËÓ ÉÍĹÎ\n"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "ĎŰÉÂËÁ ĐŇÉ ĐĎÉÓËĹ ĐÁËĹÔÁ %s\n"
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "ĐĹŇĹÉÍĹÎĎ×Ů×ÁŔ %s × %s\n"
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "ĐĹŇĹÓÔŇÁÉ×ÁŔ ÂÁÚŐ × ËĎŇÎĹ×ĎÍ ËÁÔÁĚĎÇĹ %s\n"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "×ŇĹÍĹÎÎÁŃ ÂÁÚÁ ÄÁÎÎŮČ %s ŐÖĹ ÓŐÝĹÓÔ×ŐĹÔ"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "ÓĎÚÄÁŔ ËÁÔÁĚĎÇ: %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "ĎŰÉÂËÁ ÓĎÚÄÁÎÉŃ ËÁÔÁĚĎÇÁ %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "ĎÔËŇŮ×ÁŔ ÓÔÁŇŐŔ ÂÁÚŐ\n"
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "ĎÔËŇŮ×ÁŔ ÎĎ×ŐŔ ÂÁÚŐ\n"
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "ÚÁĐÉÓŘ ÎĎÍĹŇ %d × ÂÁÚĹ ÎĹ×ĹŇÎÁ, ĐŇĎĐŐÓËÁŔ"
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "ÎĹ ÍĎÇŐ ÄĎÂÁ×ÉÔŘ ÚÁĐÉÓŘ (ĐĹŇ×ĎÎÁŢÁĚŘÎĎ × %d)"
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "ĐĹŇĹÓÔŇĎĹÎÉĹ ÂÁÚŮ ÎĹ ŐÄÁĚĎÓŘ, ÓÔÁŇÁŃ ÂÁÚÁ ĎÓÔÁĹÔÓŃ ÎÁ ÍĹÓÔĹ\n"
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr "ÚÁÍĹÎÁ ÓÔÁŇĎĘ ÂÁÚŮ ÎÁ ÎĎ×ŐŔ ÎĹ ŐÄÁĚÁÓŘ!\n"
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "ÄĚŃ ×ĎÓÓÔÁÎĎ×ĚĹÎÉŃ ÚÁÍĹÎŃĹÔ ĆÁĘĚŮ × %s ĆÁĘĚÁÍÉ ÉÚ %s"
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "ÓĎÚÄÁŔ ËÁÔÁĚĎÇ: %s\n"
 
-#: lib/rpmdb.c:2453
+#: 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 692cdd9db..a77ce5f8e 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-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-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"
@@ -2609,7 +2609,7 @@ msgstr "súbor %s sa nachádza na neznámom zariadení"
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE počet musí byť 1.\n"
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Typ údajov %d nie je podorovaný\n"
@@ -2680,107 +2680,107 @@ msgstr "| očakávené na konci výrazu"
 msgid "(unknown type)"
 msgstr "(neznámy typ)"
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr "   súbor: akcia %s: %s\n"
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr "používateľ %s neexistuje - použije sa root"
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr "skupina %s neexistuje - použije sa root"
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr "hodnota %%instchangelog v makro-súbore by mala byť číselná, ale nie je"
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "rozbalenie archívu zlyhalo%s%s: %s"
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr " pre súbor "
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr "inštaluje sa zdrojový balík\n"
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "nie je možné zapísať do %s: "
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr "nie je možné zapísať do %s: "
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr "zdroje v: %s\n"
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "nie je možné zapísať do %s: "
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "spec-súbor v: %s\n"
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr "zdrojový balík neobsahuje žiadny .spec súbor"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "premenováva sa %s na %s\n"
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "premenovanie %s na %s zlyhalo: %s"
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr "očakávaný zdrojový balík, nájdený binárny"
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "balík: %s-%s-%s test súborov = %d\n"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr "inštalácia zastavená kvôli režimu --test\n"
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr "vykonávajú sa predinštalačné skripty (ak existujú)\n"
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "varovanie: %s vytvorené ako %s"
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "varovanie: %s uchovaný ako %s"
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 #, fuzzy
 msgid "running postinstall scripts (if any)\n"
 msgstr "vykonávajú sa poinštalačné skripty (ak existujú)\n"
@@ -3274,22 +3274,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "nie je možné otvoriť %s\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3299,7 +3299,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3310,35 +3310,26 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, 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:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "chyba pri zápise záznamu %s do %s"
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "chyba pri odstraňovaní záznamu %s z %s"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "nebola nastavená žiadna dbpath"
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -3347,111 +3338,111 @@ msgstr ""
 "databázy v novom formáte"
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "chyba pri hľadaní balíka %s\n"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, 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:1727
+#: lib/rpmdb.c:1701
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "odstraňuje sa záznam z databázy\n"
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstraňuje sa index skupín\n"
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "odstraňuje sa index názvov\n"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "chyba pri hľadaní balíka %s\n"
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "premenováva sa %s na %s\n"
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: 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:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "dočasná databáza %s už existuje"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "chyba pri vytváraní adresára %s: %s"
 
-#: lib/rpmdb.c:2349
+#: 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:2358
+#: 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:2381
+#: 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:2413
+#: 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:2431
+#: 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:2439
+#: 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:2441
+#: 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:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: lib/rpmdb.c:2453
+#: 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 60f7f36dc..1b6fd89e8 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.79 2000/07/15 14:53:58 jbj Exp $
+# $Id: sl.po,v 1.80 2000/07/15 16:00:16 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-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"
@@ -2598,7 +2598,7 @@ msgstr "datoteka %s se nahaja na neznani napravi"
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "števec grabData() RPM_STRING_TYPE mora biti 1.\n"
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Tip podatkov %d ni podprt\n"
@@ -2669,107 +2669,107 @@ msgstr "| pričakovan na koncu izraza"
 msgid "(unknown type)"
 msgstr "(neznan tip)"
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr " datoteka: %s akcija: %s\n"
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr "uporabnik %s ne obstaja - uporabljamo root"
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr "skupina %s ne obstaja - uporabljamo root"
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr "vrednost %%instchangelog v makrodatoteki bi morala biti število, pa ni"
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "razpakiranje arhiva neuspešno%s%s: %s"
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr " pri datoteki "
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr "nameščanje izvornega paketa\n"
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr "ni možno ustvariti izvornega imenika %s"
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr "ni možno pisanje na %s"
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr "izvori v: %s\n"
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr "ni možno ustvariti imenika z določili spec %s"
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "datoteka spec v: %s\n"
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr "izvorni paket ne vsebuje datoteke .spec"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "preimenujemo %s v %s\n"
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "preimenovanje %s v %s neuspešno: %s"
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr "pričakovan izvorni paket, najden binarni"
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "paket: %s-%s-%s datoteke test = %d\n"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr "ustavljamo namestitev ker tečemo kot --test\n"
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr "poganjamo prednamestitvene skripte (če obstajajo)\n"
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "opozorilo: %s ustvarjen kot %s"
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "opozorilo: %s shranjen kot %s"
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr "poganjamo ponamestitvene skripte (če obstajajo)\n"
 
@@ -3259,22 +3259,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "ni možno odpreti %s: %s\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3284,7 +3284,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3295,147 +3295,138 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "napaka pri branju zapisa %s iz %s"
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "napaka pri pisanju zapisa %s v %s"
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "napaka pri brisanju zapisa %s iz %s"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "dbpath ni nastavljena"
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 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:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "napaka pri iskanju paketa %s\n"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "ni možno prebrati glave pri %d za vpogled"
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "odstranjujemo vnose v podatkovni zbirki\n"
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstranjujemo seznam skupin\n"
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "odstranjujemo seznam imen\n"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "napaka pri iskanju paketa %s\n"
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "preimenujemo %s v %s\n"
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: 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:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "začasna podatkovna zbirka %s že obstaja"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "ustvarjamo imenik: %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "napaka pri ustvarjanju imenika %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "odpiramo staro podatkovno zbirko\n"
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "odpiramo novo podatkovno zbirko\n"
 
-#: lib/rpmdb.c:2381
+#: 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:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "zapisa ni možno dodati na %d"
 
-#: lib/rpmdb.c:2431
+#: 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:2439
+#: 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:2441
+#: 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:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "ustvarjamo imenik: %s\n"
 
-#: lib/rpmdb.c:2453
+#: 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 6910c152c..25036950e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-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"
@@ -2616,7 +2616,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2689,109 +2689,109 @@ msgstr "| očekivano na kraju izraza"
 msgid "(unknown type)"
 msgstr "(nepoznat tip)"
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, fuzzy, c-format
 msgid "   file: %s action: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "instaliraj paket"
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, fuzzy, c-format
 msgid "spec file in: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "preimenovanje %s u %s nije uspelo: %s"
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "paket %s-%s-%s sadrži deljene datoteke\n"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3297,22 +3297,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "greška: ne mogu da otvorim %s\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3322,7 +3322,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3333,145 +3333,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "greška kod uzimanja sloga %s iz %s"
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "greška zapisivanja sloga %s u %s"
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "greška uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "dbpath nije određen"
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "greška kod potrage za paketom %s\n"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, 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:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "greška uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "greška uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "greška kod potrage za paketom %s\n"
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: 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:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "privremena baza podataka %s već postoji"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmdb.c:2349
+#: 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:2358
+#: 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:2381
+#: 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:2413
+#: 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:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmdb.c:2453
+#: 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 12f61f743..110d00ee1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: 2000-06-22 23:35+0200\n"
 "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -2516,7 +2516,7 @@ msgstr "filen %s är pĺ en okänd enhet"
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE mĺste vara 1.\n"
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datatyp %d stöds inte\n"
@@ -2587,107 +2587,107 @@ msgstr "| förväntades vid slutet pĺ uttryck"
 msgid "(unknown type)"
 msgstr "(okänd typ)"
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr "   fil: %s ĺtgärd: %s\n"
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr "användare %s finns inte - använder root"
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr "grupp %s finns inte - använder root"
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr "%%instchangelog-värde i makrofil skall vara ett tal, men är inte det"
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "uppackning av arkiv misslyckades%s%s: %s"
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr " vid fil "
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr "installerar källpaket\n"
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr "kan inte skapa källkatalog %s"
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr "kan inte skriva till %s"
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr "källkod i: %s\n"
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr "kan inte skapa spec-katalog %s"
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "spec-fil i: %s\n"
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr "källpaket innehĺller ingen spec-fil"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "byter namn pĺ %s till %s\n"
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "namnbyte frĺn %s till %s misslyckades: %s"
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr "källpaket förväntades, fann binärpaket"
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "paket: %s-%s-%s filtest = %d\n"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr "avbryter installation eftersom vi kör --test\n"
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr "kör (eventuellt) preinstalltionsskript\n"
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "varning: %s skapades som %s"
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "varning: %s sparades som %s"
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr "kör (eventuellt) postinstallationsskript\n"
 
@@ -3170,16 +3170,16 @@ msgstr ""
 "/etc/rpm/macros).\n"
 "\n"
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "dbiOpen: kan inte öppna %s-index"
 
-#: lib/rpmdb.c:303
-#, c-format
+#: lib/rpmdb.c:301
+#, fuzzy, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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"
@@ -3190,7 +3190,7 @@ msgstr ""
 "    databas till db%d-format genom att köra \"rpm --rebuilddb\" som root.\n"
 "\n"
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3206,7 +3206,7 @@ msgstr ""
 "/etc/rpm/macros).\n"
 "\n"
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3225,40 +3225,26 @@ msgstr ""
 "/etc/rpm/macros).\n"
 "\n"
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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 ""
-"\n"
-"--> En rpmdatabas i db1-format existerar i %s.\n"
-"    Konvertera till db%d-format genom att köra \"rpm --rebuilddb\" som "
-"root.\n"
-"\n"
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "fel(%d) när \"%s\"-poster hämtades frĺn %s-index"
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "fel(%d) när post %s sparades i %s"
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "fel(%d) när post %s togs bort ur %s"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "ingen dbpath har satts"
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -3267,110 +3253,110 @@ msgstr ""
 "i nytt format"
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr "fel(%d) när paket räknades"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "%s: kan inte läsa huvud vid 0x%x"
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "tar bort 0 %s-poster.\n"
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "tar bort \"%s\" frĺn %s-index.\n"
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "tar bort %d poster frĺn %s-index:\n"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "fel(%d) vid allokering av ny paketinstans"
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr "lägger till 0 %s-poster.\n"
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "lägger till \"%s\" till %s-index.\n"
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr "lägger till %d poster till %s-index:\n"
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "bygger om databas %s till %s\n"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "tillfällig databas %s existerar redan"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr "skapar katalog %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "fel när katalog skapades %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "öppnar gammal databas med dbapi %d\n"
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "öppnar ny databas med dbapi %d\n"
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, 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:2413
+#: 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:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n"
 
-#: lib/rpmdb.c:2439
+#: 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:2441
+#: lib/rpmdb.c:2415
 #, 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:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr "tar bort katalog %s\n"
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunde inte ta bort katalogen %s: %s\n"
@@ -3987,6 +3973,18 @@ msgstr "url-port mĺste vara ett tal\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunde inte skapa %s: %s\n"
 
+#~ msgid ""
+#~ "\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 ""
+#~ "\n"
+#~ "--> En rpmdatabas i db1-format existerar i %s.\n"
+#~ "    Konvertera till db%d-format genom att köra \"rpm --rebuilddb\" som "
+#~ "root.\n"
+#~ "\n"
+
 #, fuzzy
 #~ msgid "line %d: Invalid tag value: %s"
 #~ msgstr "rad %d: Felaktig tagg: %s"
diff --git a/po/tr.po b/po/tr.po
index ec7a83343..f9c912ffa 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-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-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"
@@ -2658,7 +2658,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2731,109 +2731,109 @@ msgstr "dizinin sonunda | bekleniyordu"
 msgid "(unknown type)"
 msgstr "(bilinmeyen tip)"
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, fuzzy, c-format
 msgid "   file: %s action: %s\n"
 msgstr "%s açýlamadý: %s"
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "paket yüklemek"
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "%s dosyasý açýlamýyor: "
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "%s dosyasý açýlamýyor: "
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "%s dosyasý açýlamýyor: "
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, fuzzy, c-format
 msgid "spec file in: %s\n"
 msgstr "%s açýlamadý: %s"
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "%s 'nin isminin  %s 'ye çevrilmesinde belirtilen hata oluţtu: %s"
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "Paket %s-%s-%s ortak (shared) dosyalar içeriyor\n"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3343,22 +3343,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "hata: %s eriţilemiyor\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3368,7 +3368,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3379,145 +3379,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "%s kaydýna %s dosyasýnda eriţilemiyor:"
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "%s kaydý %s dosyasýna yazýlamýyor"
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "dbpath deđeri girilmemiţ"
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "%s pakedi aranýrken hata oluţtu\n"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "%d kaydýndan baţlýk bilgisi okunamadý"
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "%s pakedi aranýrken hata oluţtu\n"
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: 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:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "geçici veritabaný %s mevcut"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "%s dizinin oluţturulmasýnda hata: %s"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "%s dizinin oluţturulmasýnda hata: %s"
 
-#: lib/rpmdb.c:2349
+#: 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:2358
+#: 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:2381
+#: 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:2413
+#: 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:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "%s dizinin oluţturulmasýnda hata: %s"
 
-#: lib/rpmdb.c:2453
+#: 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 35f075016..282bbe2c9 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-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-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"
@@ -2457,7 +2457,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2528,107 +2528,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3100,22 +3100,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in 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
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3125,7 +3125,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3136,145 +3136,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\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:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""