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

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

1 files changed, 58 insertions, 39 deletions

diff --git a/po/es.po b/po/es.po
index a4babcca4..772eb2202 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-16 14:54-0400\n"
+"POT-Creation-Date: 2000-06-18 18:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3163,12 +3163,12 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:94
+#: lib/rpmdb.c:95
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:258
 msgid ""
 "\n"
 "--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
@@ -3178,15 +3178,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:292
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:298
+#: lib/rpmdb.c:303
+#, c-format
+msgid ""
+"\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"    If you have just upgraded the rpm package you need to convert\n"
+"    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:317
+msgid ""
+"\n"
+"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
+"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
+"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
+"/etc/rpm/macros).\n"
+"\n"
+msgstr ""
+
+#: lib/rpmdb.c:332
 msgid ""
 "\n"
-"--> The database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database is in db%d format, not the suggested db%d format.\n"
 "    Please verify the setting of the macros %%_dbapi and %%_dbapi_rebuild\n"
 "    using \"rpm --showrc\", and either run \"rpm --rebuilddb\" as root\n"
 "    to convert your database from db%d to db%d format, or configure\n"
@@ -3194,151 +3214,150 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:311
+#: lib/rpmdb.c:351
+#, c-format
 msgid ""
 "\n"
-"--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
-"    Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-"    and configure \"%%_dbapi %d\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+"--> An rpm database in db1 format exists in %s.\n"
+"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:376
+#: lib/rpmdb.c:423
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:494
+#: lib/rpmdb.c:541
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:503
+#: lib/rpmdb.c:550
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:726 lib/rpmdb.c:2231
+#: lib/rpmdb.c:773 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:825
+#: lib/rpmdb.c:872
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1035
+#: lib/rpmdb.c:1082
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1093 lib/rpmdb.c:1606 lib/uninstall.c:90
+#: lib/rpmdb.c:1140 lib/rpmdb.c:1653 lib/uninstall.c:90
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1658
+#: lib/rpmdb.c:1705
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1669
+#: lib/rpmdb.c:1716
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1678
+#: lib/rpmdb.c:1725
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1685 lib/rpmdb.c:1906
+#: lib/rpmdb.c:1732 lib/rpmdb.c:1953
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1818
+#: lib/rpmdb.c:1865
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1874
+#: lib/rpmdb.c:1921
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1937
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1899
+#: lib/rpmdb.c:1946
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2256
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2260
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2266
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2284
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2307
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2339
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2357
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2365
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2367
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2377
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2379
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""