summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES1
-rw-r--r--Makefile.am2
-rw-r--r--lib/rpmdb.c42
-rw-r--r--po/cs.po86
-rw-r--r--po/da.po82
-rw-r--r--po/de.po83
-rw-r--r--po/es.po78
-rw-r--r--po/fi.po82
-rw-r--r--po/fr.po82
-rw-r--r--po/gl.po78
-rw-r--r--po/hu.po78
-rw-r--r--po/id.po78
-rw-r--r--po/is.po78
-rw-r--r--po/it.po78
-rw-r--r--po/ja.po84
-rw-r--r--po/ko.po78
-rw-r--r--po/no.po78
-rw-r--r--po/pl.po82
-rw-r--r--po/pt.po78
-rw-r--r--po/pt_BR.po84
-rw-r--r--po/ro.po78
-rw-r--r--po/rpm.pot78
-rw-r--r--po/ru.po82
-rw-r--r--po/sk.po82
-rw-r--r--po/sl.po84
-rw-r--r--po/sr.po82
-rw-r--r--po/sv.po86
-rw-r--r--po/tr.po82
-rw-r--r--po/uk.po78
-rw-r--r--po/wa.po78
-rw-r--r--po/zh.po78
-rw-r--r--po/zh_CN.GB2312.po78
-rw-r--r--rpm.spec1
33 files changed, 1254 insertions, 1125 deletions
diff --git a/CHANGES b/CHANGES
index ae27addc1..78d81f767 100644
--- a/CHANGES
+++ b/CHANGES
@@ -83,6 +83,7 @@
- fix: don't attempt dbiOpen with anything but requested dbN.
- create rpmbuild/rpmquery/rpmverify/rpmsign symlinks.
- fix: look for any/all dbapi when rebuilding.
+ - link rpm2cpio dynamically since cpio is linked dynamically.
3.0.4 -> 3.0.5
- configure.in fiddles for BSD systems (Patrick Schoo).
diff --git a/Makefile.am b/Makefile.am
index 43f7eccf9..c27c51592 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -81,7 +81,7 @@ rpmq.o: rpmqv.c
$(COMPILE) -DIAM_RPMQV -o $@ -c $<
rpm2cpio_SOURCES = rpm2cpio.c
-rpm2cpio_LDFLAGS = @LDFLAGS_STATIC@ $(myLDFLAGS)
+rpm2cpio_LDFLAGS = $(myLDFLAGS)
rpm2cpio_LDADD = $(myLDADD) @LIBMISC@
$(PROGRAMS): $(myLDADD)
diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index 34447e442..4bc5ba7ff 100644
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -244,10 +244,10 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, /*@unused@*/ unsigned int flags)
if ((dbi = rpmdb->_dbi[dbix]) != NULL)
return dbi;
- _dbapi_wanted = (_rebuildinprogress ? -1 : rpmdb->db_api);
_dbapi_rebuild = rpmExpandNumeric("%{_dbapi_rebuild}");
if (_dbapi_rebuild < 1 || _dbapi_rebuild > 3)
_dbapi_rebuild = 3;
+ _dbapi_wanted = (_rebuildinprogress ? -1 : rpmdb->db_api);
switch (_dbapi_wanted) {
default:
@@ -258,7 +258,7 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, /*@unused@*/ unsigned int flags)
fprintf(stderr, _("\n\
--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n\
Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n\
- and configure \"%%_dbapi -1\" (e.g. create and/or edit /etc/rpm/macros).\n\
+ and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n\
\n\
"), _dbapi_wanted);
return NULL;
@@ -266,6 +266,15 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, /*@unused@*/ unsigned int flags)
errno = 0;
dbi = NULL;
rc = (*mydbvecs[_dbapi]->open) (rpmdb, rpmtag, &dbi);
+ if (rc) {
+ static int _printed[32];
+ if (!_printed[dbix & 0x1f]++)
+ rpmError(RPMERR_DBOPEN,
+ _("cannot open %s index using db%d - %s (%d)"),
+ tagName(rpmtag), _dbapi,
+ (rc > 0 ? strerror(rc) : ""), rc);
+ _dbapi = -1;
+ }
break;
case -1:
_dbapi = 4;
@@ -278,23 +287,21 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, /*@unused@*/ unsigned int flags)
if (rc == 0 && dbi)
break;
}
+ if (_dbapi <= 0) {
+ static int _printed[32];
+ if (!_printed[dbix & 0x1f]++)
+ rpmError(RPMERR_DBOPEN, _("cannot open %s index"),
+ tagName(rpmtag));
+ rc = 1;
+ goto exit;
+ }
if (rpmdb->db_api == -1 && _dbapi > 0)
rpmdb->db_api = _dbapi;
break;
}
- /* Failed to open with any dbapi */
- if (_dbapi <= 0) {
- static int _printed[32];
- if (!_printed[dbix & 0x1f]++)
- rpmError(RPMERR_DBOPEN, _("dbiOpen: cannot open %s index"),
- tagName(rpmtag));
- rc = 1;
- goto exit;
- }
-
/* Require conversion. */
- if (_dbapi_wanted >= 0 && _dbapi != _dbapi_wanted && _dbapi_wanted == _dbapi_rebuild) {
+ if (rc && _dbapi_wanted >= 0 && _dbapi != _dbapi_wanted && _dbapi_wanted == _dbapi_rebuild) {
static int _printed = 0;
rc = (_rebuildinprogress ? 0 : 1);
if (rc && !_printed++)
@@ -303,7 +310,7 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, /*@unused@*/ unsigned int flags)
If you have just upgraded the rpm package you need to convert\n\
your database to db%d format by running \"rpm --rebuilddb\" as root.\n\
\n\
-"), _dbapi, (_dbapi_rebuild > 0 ? _dbapi_rebuild : 3));
+"), _dbapi_wanted, (_dbapi_rebuild > 0 ? _dbapi_rebuild : 3));
goto exit;
}
@@ -1718,7 +1725,7 @@ int rpmdbRemove(rpmdb rpmdb, unsigned int hdrNum)
rpmcnt = 1;
} else {
- rpmMessage(RPMMESS_DEBUG, _("removing %d entries from %s index:\n"),
+ rpmMessage(RPMMESS_DEBUG, _("removing %d entries from %s index.\n"),
rpmcnt, tagName(dbi->dbi_rpmtag));
}
@@ -1942,7 +1949,7 @@ int rpmdbAdd(rpmdb rpmdb, Header h)
rpmcnt = 1;
} else {
- rpmMessage(RPMMESS_DEBUG, _("adding %d entries to %s index:\n"),
+ rpmMessage(RPMMESS_DEBUG, _("adding %d entries to %s index.\n"),
rpmcnt, tagName(dbi->dbi_rpmtag));
}
@@ -2272,7 +2279,6 @@ int rpmdbRebuild(const char * rootdir)
_dbapi = rpmExpandNumeric("%{_dbapi}");
_dbapi_rebuild = rpmExpandNumeric("%{_dbapi_rebuild}");
- _rebuildinprogress = 1;
tfn = rpmGetPath("%{_dbpath}", NULL);
if (!(tfn && tfn[0] != '%')) {
@@ -2322,12 +2328,14 @@ int rpmdbRebuild(const char * rootdir)
rpmMessage(RPMMESS_DEBUG, _("opening old database with dbapi %d\n"),
_dbapi);
+ _rebuildinprogress = 1;
if (openDatabase(rootdir, dbpath, _dbapi, &olddb, O_RDONLY, 0644,
RPMDB_FLAG_MINIMAL)) {
rc = 1;
goto exit;
}
_dbapi = olddb->db_api;
+ _rebuildinprogress = 0;
rpmMessage(RPMMESS_DEBUG, _("opening new database with dbapi %d\n"),
_dbapi_rebuild);
diff --git a/po/cs.po b/po/cs.po
index afb0a8f0a..1fe188af4 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-07-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-0400\n"
"PO-Revision-Date: 2000-07-27 15:59+0100\n"
"Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -3109,22 +3109,26 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
"\n"
"--> Tato verze RPM nebyla zkompilována s podporou pro \"%%_dbapi %d\".\n"
" Ověřte prosím nastavení makra %%_dbapi pomocí \"rpm --showrc\"\n"
-" a nastavte \"%%_dbapi -1\" (tj. vytvořte nebo upravte /etc/rpm/macros).\n"
+" a nastavte \"%%_dbapi 3\" (tj. vytvořte nebo upravte /etc/rpm/macros).\n"
"\n"
-#: lib/rpmdb.c:290
-#, c-format
-msgid "dbiOpen: cannot open %s index"
+#: lib/rpmdb.c:273
+#, fuzzy, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr "nemohu otevřít soubor %s na %s:%d: %s"
+
+#: lib/rpmdb.c:293
+#, fuzzy, c-format
+msgid "cannot open %s index"
msgstr "dbiOpen: nemohu otevřít index %s"
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3140,7 +3144,7 @@ msgstr ""
" jako root.\n"
"\n"
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3155,7 +3159,7 @@ msgstr ""
" a nastavte \"%%_dbapi %d\" (tj. vytvořte nebo upravte /etc/rpm/macros).\n"
"\n"
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3173,26 +3177,26 @@ msgstr ""
" \"%%_dbapi_rebuild %d\" (tj. vytvořte nebo upravte /etc/rpm/macros).\n"
"\n"
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr "chyba(%d) při získávání záznamu \"%s\" z indexu %s"
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, c-format
msgid "error(%d) storing record %s into %s"
msgstr "chyba(%d) při ukládání záznamu %s do %s"
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, c-format
msgid "error(%d) removing record %s from %s"
msgstr "chyba(%d) při odstraňování záznamu %s z %s"
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr "nebyla nastavena dbpath"
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
@@ -3201,111 +3205,111 @@ msgstr ""
"formátu databáze"
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, c-format
msgid "error(%d) counting packages"
msgstr "chyba(%d) při počítání balíčků"
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 lib/uninstall.c:97
#, c-format
msgid "%s: cannot read header at 0x%x"
msgstr "%s: nemohu číst hlavičku na 0x%x"
-#: lib/rpmdb.c:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr "odstraňuji 0 %s položek.\n"
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "odstraňuji \"%s\" z indexu %s.\n"
-#: lib/rpmdb.c:1721
-#, c-format
-msgid "removing %d entries from %s index:\n"
+#: lib/rpmdb.c:1728
+#, fuzzy, c-format
+msgid "removing %d entries from %s index.\n"
msgstr "odstraňuji %d položek z indexu %s:\n"
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, c-format
msgid "error(%d) allocating new package instance"
msgstr "chyba(%d) při alokaci nové instance balíčku"
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr "přidávám 0 %s položek.\n"
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "přidávám \"%s\" do indexu %s\n"
-#: lib/rpmdb.c:1945
-#, c-format
-msgid "adding %d entries to %s index:\n"
+#: lib/rpmdb.c:1952
+#, fuzzy, c-format
+msgid "adding %d entries to %s index.\n"
msgstr "přidávám %d položek do indexu %s:\n"
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "databázi %s převádím do %s\n"
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr "dočasná databáze %s již existuje"
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, c-format
msgid "creating directory %s\n"
msgstr "vytvářím adresář %s\n"
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr "chyba při vytváření adresáře %s: %s"
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "otevírám starou databázi s dbapi %d\n"
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "otevírám novou databázi s dbapi %d\n"
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr "záznam číslo %d v databázi je chybný -- vynechávám."
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr "nemohu přidat záznam - původně u %d"
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"databázi nelze zvovu vytvořit; původní databáze zůstává na svém místě\n"
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr "starou databázi nelze nahradit novou databází!\n"
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "pro obnovení nahraďte soubory v %s soubory z %s"
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, c-format
msgid "removing directory %s\n"
msgstr "mažu adresář %s\n"
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "nemohu odstranit adresář %s: %s\n"
diff --git a/po/da.po b/po/da.po
index 9638391e5..097c2da96 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-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -3069,17 +3069,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
-#, c-format
-msgid "dbiOpen: cannot open %s index"
-msgstr ""
+#: lib/rpmdb.c:273
+#, fuzzy, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr "kan ikke ĺbne %s ved %s:%d: %s"
+
+#: lib/rpmdb.c:293
+#, fuzzy, c-format
+msgid "cannot open %s index"
+msgstr "kan ikke ĺbne %s: %s\n"
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3089,7 +3093,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3099,7 +3103,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3110,136 +3114,136 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr ""
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, c-format
msgid "error(%d) storing record %s into %s"
msgstr ""
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, c-format
msgid "error(%d) removing record %s from %s"
msgstr ""
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, c-format
msgid "error(%d) counting packages"
msgstr ""
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 lib/uninstall.c:97
#, c-format
msgid "%s: cannot read header at 0x%x"
msgstr ""
-#: lib/rpmdb.c:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, c-format
msgid "error(%d) allocating new package instance"
msgstr ""
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1952
#, c-format
-msgid "adding %d entries to %s index:\n"
+msgid "adding %d entries to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr ""
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, c-format
msgid "creating directory %s\n"
msgstr "opretter kataloget %s\n"
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr ""
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr ""
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, c-format
msgid "removing directory %s\n"
msgstr "fjener kataloget %s\n"
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/de.po b/po/de.po
index 45a374d63..64d29fc62 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-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -3363,17 +3363,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, fuzzy, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr "kann Datei %s nicht öffnen: "
+
+#: lib/rpmdb.c:293
#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr "Fehler: kann %s nicht öffnen\n"
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3383,7 +3387,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3393,7 +3397,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3404,141 +3408,142 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr "Fehler beim Eintrag %s von %s"
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s"
msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
# FIXME
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, fuzzy, c-format
msgid "error(%d) removing record %s from %s"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr "ťdbpathŤ ist nicht gesetzt"
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, fuzzy, c-format
msgid "error(%d) counting packages"
msgstr "Fehler beim Suchen nach Paket %s\n"
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 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:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
# FIXME
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
# FIXME
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, fuzzy, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, fuzzy, c-format
msgid "error(%d) allocating new package instance"
msgstr "Fehler beim Suchen nach Paket %s\n"
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1945
-#, c-format
-msgid "adding %d entries to %s index:\n"
-msgstr ""
+# FIXME
+#: lib/rpmdb.c:1952
+#, fuzzy, c-format
+msgid "adding %d entries to %s index.\n"
+msgstr "Fehler beim Löschen des Eintrags %s nach %s"
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "Datenbank aus der vorhandenen neu erstellen"
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr "die temporäre Datenbank %s existiert schon"
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "Datenbank aus der vorhandenen neu erstellen"
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "Datenbank aus der vorhandenen neu erstellen"
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, 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:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d"
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
# , c-format
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, 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 3c2e27fc9..19aae58de 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-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -3048,17 +3048,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr ""
+
+#: lib/rpmdb.c:293
#, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr ""
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3068,7 +3072,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3078,7 +3082,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3089,136 +3093,136 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr ""
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, c-format
msgid "error(%d) storing record %s into %s"
msgstr ""
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, c-format
msgid "error(%d) removing record %s from %s"
msgstr ""
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, c-format
msgid "error(%d) counting packages"
msgstr ""
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 lib/uninstall.c:97
#, c-format
msgid "%s: cannot read header at 0x%x"
msgstr ""
-#: lib/rpmdb.c:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, c-format
msgid "error(%d) allocating new package instance"
msgstr ""
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1952
#, c-format
-msgid "adding %d entries to %s index:\n"
+msgid "adding %d entries to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr ""
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr ""
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr ""
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 4fa73a8cb..5af94b051 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
msgid ""
msgstr ""
-"POT-Creation-Date: 2000-07-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-0400\n"
"Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
"Language-Team: Finnish <linux@sot.com>\n"
"Content-Type: text/plain; charset=\n"
@@ -3288,17 +3288,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, fuzzy, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr "en voinut avata tiedostoa %s: "
+
+#: lib/rpmdb.c:293
#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr "virhe: en voi avata %s\n"
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3308,7 +3312,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3318,7 +3322,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3329,136 +3333,136 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr "virhe luettaessa tietuetta %s %s:stä"
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s"
msgstr "virhe talletettaessa tietuetta %s %s:ään"
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, fuzzy, c-format
msgid "error(%d) removing record %s from %s"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr "dbpath ei ole asetettu"
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, fuzzy, c-format
msgid "error(%d) counting packages"
msgstr "virhe etsittäessä pakettia %s\n"
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 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:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, fuzzy, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, fuzzy, c-format
msgid "error(%d) allocating new package instance"
msgstr "virhe etsittäessä pakettia %s\n"
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1945
-#, c-format
-msgid "adding %d entries to %s index:\n"
-msgstr ""
+#: lib/rpmdb.c:1952
+#, fuzzy, c-format
+msgid "adding %d entries to %s index.\n"
+msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr "väliaikainen tietokanta %s on jo olemassa"
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, fuzzy, c-format
msgid "record number %d in database is bad -- skipping."
msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen"
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr "en voi lisätä tietuetta %d:stä"
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, 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 10cf8c2ba..b55754879 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
msgid ""
-msgstr "POT-Creation-Date: 2000-07-28 17:49-0400\n"
+msgstr "POT-Creation-Date: 2000-07-29 13:25-0400\n"
#: build.c:25 lib/rpminstall.c:451
#, c-format
@@ -3281,17 +3281,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, fuzzy, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: lib/rpmdb.c:293
#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3301,7 +3305,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3311,7 +3315,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3322,136 +3326,136 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, fuzzy, c-format
msgid "error(%d) removing record %s from %s"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, fuzzy, c-format
msgid "error(%d) counting packages"
msgstr "aucun package n'a été spécifié pour l'installation"
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 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:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, fuzzy, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, c-format
msgid "error(%d) allocating new package instance"
msgstr ""
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1945
-#, c-format
-msgid "adding %d entries to %s index:\n"
-msgstr ""
+#: lib/rpmdb.c:1952
+#, fuzzy, c-format
+msgid "adding %d entries to %s index.\n"
+msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr ""
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr ""
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr ""
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, 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 3c2e27fc9..19aae58de 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-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -3048,17 +3048,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr ""
+
+#: lib/rpmdb.c:293
#, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr ""
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3068,7 +3072,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3078,7 +3082,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3089,136 +3093,136 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr ""
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, c-format
msgid "error(%d) storing record %s into %s"
msgstr ""
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, c-format
msgid "error(%d) removing record %s from %s"
msgstr ""
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, c-format
msgid "error(%d) counting packages"
msgstr ""
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 lib/uninstall.c:97
#, c-format
msgid "%s: cannot read header at 0x%x"
msgstr ""
-#: lib/rpmdb.c:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, c-format
msgid "error(%d) allocating new package instance"
msgstr ""
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1952
#, c-format
-msgid "adding %d entries to %s index:\n"
+msgid "adding %d entries to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr ""
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr ""
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr ""
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 3c2e27fc9..19aae58de 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-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -3048,17 +3048,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr ""
+
+#: lib/rpmdb.c:293
#, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr ""
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3068,7 +3072,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3078,7 +3082,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3089,136 +3093,136 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr ""
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, c-format
msgid "error(%d) storing record %s into %s"
msgstr ""
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, c-format
msgid "error(%d) removing record %s from %s"
msgstr ""
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, c-format
msgid "error(%d) counting packages"
msgstr ""
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 lib/uninstall.c:97
#, c-format
msgid "%s: cannot read header at 0x%x"
msgstr ""
-#: lib/rpmdb.c:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, c-format
msgid "error(%d) allocating new package instance"
msgstr ""
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1952
#, c-format
-msgid "adding %d entries to %s index:\n"
+msgid "adding %d entries to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr ""
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr ""
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr ""
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/id.po b/po/id.po
index 3c2e27fc9..19aae58de 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-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -3048,17 +3048,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr ""
+
+#: lib/rpmdb.c:293
#, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr ""
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3068,7 +3072,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3078,7 +3082,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3089,136 +3093,136 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr ""
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, c-format
msgid "error(%d) storing record %s into %s"
msgstr ""
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, c-format
msgid "error(%d) removing record %s from %s"
msgstr ""
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, c-format
msgid "error(%d) counting packages"
msgstr ""
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 lib/uninstall.c:97
#, c-format
msgid "%s: cannot read header at 0x%x"
msgstr ""
-#: lib/rpmdb.c:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, c-format
msgid "error(%d) allocating new package instance"
msgstr ""
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1952
#, c-format
-msgid "adding %d entries to %s index:\n"
+msgid "adding %d entries to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr ""
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr ""
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr ""
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/is.po b/po/is.po
index f7621eb56..0211bb8cd 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-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -3043,17 +3043,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
#, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index using db%d - %s (%d)"
msgstr ""
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:293
+#, fuzzy, c-format
+msgid "cannot open %s index"
+msgstr "get ekki opnađ %s/packages.rpm\n"
+
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3063,7 +3067,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3073,7 +3077,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3084,136 +3088,136 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr ""
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, c-format
msgid "error(%d) storing record %s into %s"
msgstr ""
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, c-format
msgid "error(%d) removing record %s from %s"
msgstr ""
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, c-format
msgid "error(%d) counting packages"
msgstr ""
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 lib/uninstall.c:97
#, c-format
msgid "%s: cannot read header at 0x%x"
msgstr ""
-#: lib/rpmdb.c:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, c-format
msgid "error(%d) allocating new package instance"
msgstr ""
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1952
#, c-format
-msgid "adding %d entries to %s index:\n"
+msgid "adding %d entries to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr ""
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr ""
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr ""
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/it.po b/po/it.po
index 3c2e27fc9..19aae58de 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-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -3048,17 +3048,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr ""
+
+#: lib/rpmdb.c:293
#, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr ""
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3068,7 +3072,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3078,7 +3082,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3089,136 +3093,136 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr ""
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, c-format
msgid "error(%d) storing record %s into %s"
msgstr ""
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, c-format
msgid "error(%d) removing record %s from %s"
msgstr ""
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, c-format
msgid "error(%d) counting packages"
msgstr ""
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 lib/uninstall.c:97
#, c-format
msgid "%s: cannot read header at 0x%x"
msgstr ""
-#: lib/rpmdb.c:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, c-format
msgid "error(%d) allocating new package instance"
msgstr ""
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1952
#, c-format
-msgid "adding %d entries to %s index:\n"
+msgid "adding %d entries to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr ""
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr ""
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr ""
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 2d845f67b..c744da448 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-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -83,7 +83,7 @@ msgstr "ĽżĄźĽ˛ĽĂĽČ %s ÍѤ˺îŔŽĂć\n"
# build root [BuildRoot]
# net share [ĽÍĽĂĽČśŚÍ­]
# reloate [şĆÇŰĂÖ/°ÜĆ°¤š¤ë]
-# $Id: ja.po,v 1.102 2000/07/29 13:16:46 jbj Exp $
+# $Id: ja.po,v 1.103 2000/07/29 17:30:19 jbj Exp $
#: rpm.c:178 rpmqv.c:257
#, c-format
msgid "rpm: %s\n"
@@ -3242,17 +3242,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, fuzzy, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr "%s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó %s:%d"
+
+#: lib/rpmdb.c:293
#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr "%s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n"
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3262,7 +3266,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3272,7 +3276,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3283,138 +3287,138 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr "ĽěĽłĄźĽÉ %s ¤ÎźčĆŔ¤ÎĽ¨ĽéĄź (%s ¤Ť¤é)"
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s"
msgstr "ĽěĽłĄźĽÉ %s ¤ň %s ¤ËĽšĽČĽ˘¤ÇĽ¨ĽéĄź "
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, fuzzy, c-format
msgid "error(%d) removing record %s from %s"
msgstr "ĽěĽłĄźĽÉ %s ¤ň %s ¤Ëşď˝ü¤ÇĽ¨ĽéĄź"
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr "dbpath ¤ŹŔßÄꤾ¤ě¤Ć¤¤¤Ţ¤ť¤ó"
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, fuzzy, c-format
msgid "error(%d) counting packages"
msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ÎĂľş÷Ľ¨ĽéĄź\n"
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 lib/uninstall.c:97
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x"
msgstr "¸Ąş÷¤Î¤ż¤á¤Î %d ¤Ç ĽŘĽĂĽŔ¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó"
-#: lib/rpmdb.c:1701
+#: lib/rpmdb.c:1708
#, fuzzy, c-format
msgid "removing 0 %s entries.\n"
msgstr "ĽÇĄźĽżĽŮĄźĽšĽ¨ĽóĽČĽę¤ňşď˝ü¤ˇ¤Ţ¤š\n"
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "group Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n"
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, fuzzy, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr "name Ľ¤ĽóĽÇĽĂĽŻĽšşď˝ü¤ˇ¤Ţ¤š\n"
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, fuzzy, c-format
msgid "error(%d) allocating new package instance"
msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ÎĂľş÷Ľ¨ĽéĄź\n"
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "%s ¤ň %s ¤ŘĚžÁ°¤ňĘŃšš¤ˇ¤Ţ¤š\n"
-#: lib/rpmdb.c:1945
-#, c-format
-msgid "adding %d entries to %s index:\n"
-msgstr ""
+#: lib/rpmdb.c:1952
+#, fuzzy, c-format
+msgid "adding %d entries to %s index.\n"
+msgstr "%s ¤ň %s ¤ŘĚžÁ°¤ňĘŃšš¤ˇ¤Ţ¤š\n"
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "rootdir %s Ăć¤ÇĽÇĄźĽżĽŮĄźĽš¤ňşĆš˝Ăۤˇ¤Ţ¤š\n"
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr "°ěťţĹŞ¤ĘĽÇĄźĽżĽŮĄźĽš %s ¤Ď¤š¤Ç¤Ë¸şß¤ˇ¤Ć¤¤¤Ţ¤š"
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr "ĽÇĽŁĽěĽŻĽČĽę %s ¤ÎşîŔŽĽ¨ĽéĄź: %s"
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "¸Ĺ¤¤ĽÇĄźĽżĽŮĄźĽš¤ÎĽŞĄźĽ×Ľó\n"
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "żˇ¤ˇ¤¤ĽÇĄźĽżĽŮĄźĽš¤ÎĽŞĄźĽ×Ľó\n"
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, fuzzy, c-format
msgid "record number %d in database is bad -- skipping."
msgstr "ĽÇĄźĽżĽŮĄźĽšĂć¤ÎĽěĽłĄźĽÉČÖšć %d ¤ĎÉÔŔľ¤Ç¤š -- ĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š"
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr "%d ¤Ë ĽŞĽęĽ¸ĽĘĽë¤ÎĽěĽłĄźĽÉ¤ňÉղäǤ­¤Ţ¤ť¤ó"
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
#, fuzzy
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"ĽÇĄźĽżĽŮĄźĽš¤ÎşĆš˝Ăۤ˟şÇÔ; ĽŞĽęĽ¸ĽĘĽëĽÇĄźĽżĽŮĄźĽš¤Ź¤Ţ¤Ŕ¤˝¤ł¤ËťÄ¤Ă¤Ć¤¤¤Ţ¤š\n"
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr "¸Ĺ¤¤ĽÇĄźĽżĽŮĄźĽš¤ňżˇ¤ˇ¤¤ĽÇĄźĽżĽŮĄźĽš¤ËĂÖ¤­´š¤¨¤ë¤Î¤ËźşÇÔ!\n"
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "%s Ăć¤ÎĽŐĽĄĽ¤Ľë¤ňĽęĽŤĽĐĄź¤š¤ë¤ż¤á¤Ë %s ¤Ť¤éĽŐĽĄĽ¤Ľë¤ČĂÖ¤­´š¤¨¤Ţ¤š"
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, 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 3c2e27fc9..19aae58de 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-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -3048,17 +3048,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr ""
+
+#: lib/rpmdb.c:293
#, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr ""
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3068,7 +3072,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3078,7 +3082,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3089,136 +3093,136 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr ""
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, c-format
msgid "error(%d) storing record %s into %s"
msgstr ""
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, c-format
msgid "error(%d) removing record %s from %s"
msgstr ""
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, c-format
msgid "error(%d) counting packages"
msgstr ""
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 lib/uninstall.c:97
#, c-format
msgid "%s: cannot read header at 0x%x"
msgstr ""
-#: lib/rpmdb.c:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, c-format
msgid "error(%d) allocating new package instance"
msgstr ""
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1952
#, c-format
-msgid "adding %d entries to %s index:\n"
+msgid "adding %d entries to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr ""
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr ""
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr ""
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/no.po b/po/no.po
index 74facec24..3e2bc5df3 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-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -3073,17 +3073,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
#, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index using db%d - %s (%d)"
msgstr ""
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:293
+#, fuzzy, c-format
+msgid "cannot open %s index"
+msgstr "kan ikke ĺpne %s/packages.rpm\n"
+
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3093,7 +3097,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3103,7 +3107,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3114,136 +3118,136 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr ""
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, c-format
msgid "error(%d) storing record %s into %s"
msgstr ""
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, c-format
msgid "error(%d) removing record %s from %s"
msgstr ""
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, c-format
msgid "error(%d) counting packages"
msgstr ""
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 lib/uninstall.c:97
#, c-format
msgid "%s: cannot read header at 0x%x"
msgstr ""
-#: lib/rpmdb.c:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, c-format
msgid "error(%d) allocating new package instance"
msgstr ""
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1952
#, c-format
-msgid "adding %d entries to %s index:\n"
+msgid "adding %d entries to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr ""
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr ""
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr ""
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index a42c7d1bb..5e1a1f488 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-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -3214,17 +3214,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, fuzzy, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr "nie można otworzyć %s przy %s:%d"
+
+#: lib/rpmdb.c:293
#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr "nie można otworzyć %s\n"
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3234,7 +3238,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3244,7 +3248,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3255,26 +3259,26 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr "błąd pobierania rekordu %s z %s"
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s"
msgstr "błąd zapisywania rekordu %s do %s"
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, fuzzy, c-format
msgid "error(%d) removing record %s from %s"
msgstr "błąd usuwania rekordu %s z %s"
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr "ścieżka bazy danych nie została podana"
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
@@ -3283,111 +3287,111 @@ msgstr ""
"nowym formacie"
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, fuzzy, c-format
msgid "error(%d) counting packages"
msgstr "błąd szukania pakietu %s\n"
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 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:1701
+#: lib/rpmdb.c:1708
#, fuzzy, c-format
msgid "removing 0 %s entries.\n"
msgstr "usuwanie wpisu w bazie\n"
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "usuwanie indeksu grupy\n"
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, fuzzy, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr "usuwanie indeksu nazw\n"
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, fuzzy, c-format
msgid "error(%d) allocating new package instance"
msgstr "błąd szukania pakietu %s\n"
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "zmiana nazwy %s na %s\n"
-#: lib/rpmdb.c:1945
-#, c-format
-msgid "adding %d entries to %s index:\n"
-msgstr ""
+#: lib/rpmdb.c:1952
+#, fuzzy, c-format
+msgid "adding %d entries to %s index.\n"
+msgstr "zmiana nazwy %s na %s\n"
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "odbudowywuję bazę danych w rootdir %s\n"
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr "tymczasowa baza danych %s już istnieje"
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "tworzenie katalogu: %s\n"
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr "błąd przy tworzeniu katalogu %s: %s"
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "otwieranie starej bazy danych\n"
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "otwieranie nowej bazy danych\n"
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, 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:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr "nie można dodać rekordu oryginalnie przy %d"
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
#, 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:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr "zamiana starej bazy na nową nie powiodła się!\n"
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, 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:2425
+#: lib/rpmdb.c:2433
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "tworzenie katalogu: %s\n"
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, 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 3c2e27fc9..19aae58de 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-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -3048,17 +3048,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr ""
+
+#: lib/rpmdb.c:293
#, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr ""
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3068,7 +3072,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3078,7 +3082,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3089,136 +3093,136 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr ""
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, c-format
msgid "error(%d) storing record %s into %s"
msgstr ""
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, c-format
msgid "error(%d) removing record %s from %s"
msgstr ""
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, c-format
msgid "error(%d) counting packages"
msgstr ""
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 lib/uninstall.c:97
#, c-format
msgid "%s: cannot read header at 0x%x"
msgstr ""
-#: lib/rpmdb.c:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, c-format
msgid "error(%d) allocating new package instance"
msgstr ""
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1952
#, c-format
-msgid "adding %d entries to %s index:\n"
+msgid "adding %d entries to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr ""
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr ""
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr ""
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f113ba4e4..175d77a61 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-28 17:49-0400\n"
+msgstr "POT-Creation-Date: 2000-07-29 13:25-0400\n"
#: build.c:25 lib/rpminstall.c:451
#, c-format
@@ -3354,18 +3354,23 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
# , c-format
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index using db%d - %s (%d)"
msgstr "Năo consegui abrir: %s\n"
-#: lib/rpmdb.c:301
+# , c-format
+#: lib/rpmdb.c:293
+#, fuzzy, c-format
+msgid "cannot open %s index"
+msgstr "Năo consegui abrir: %s\n"
+
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3375,7 +3380,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3385,7 +3390,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3397,130 +3402,131 @@ msgid ""
msgstr ""
# , c-format
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr "Năo consegui abrir: %s\n"
# , c-format
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s"
msgstr "Năo consegui abrir: %s\n"
# , c-format
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, fuzzy, c-format
msgid "error(%d) removing record %s from %s"
msgstr "Năo consegui abrir: %s\n"
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, fuzzy, c-format
msgid "error(%d) counting packages"
msgstr "năo foi passado pacote para instalaçăo"
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 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:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
# , c-format
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, fuzzy, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr "Năo consegui abrir: %s\n"
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, c-format
msgid "error(%d) allocating new package instance"
msgstr ""
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1945
-#, c-format
-msgid "adding %d entries to %s index:\n"
-msgstr ""
+# , c-format
+#: lib/rpmdb.c:1952
+#, fuzzy, c-format
+msgid "adding %d entries to %s index.\n"
+msgstr "Năo consegui abrir: %s\n"
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, 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:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr ""
# , c-format
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "Năo consegui abrir: %s\n"
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr ""
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, 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:2332
+#: lib/rpmdb.c:2340
#, 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:2355
+#: lib/rpmdb.c:2363
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr ""
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
@@ -3533,13 +3539,13 @@ msgstr ""
# "Content-Type: text/plain; charset=ISO-8859-1\n"
# "Content-Transfer-Encoding: 8-bit\n"
# , c-format
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "RPM versăo %s\n"
# , c-format
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, 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 0940ff1a8..875505503 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-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -3043,17 +3043,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr ""
+
+#: lib/rpmdb.c:293
#, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr ""
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3063,7 +3067,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3073,7 +3077,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3084,136 +3088,136 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr ""
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, c-format
msgid "error(%d) storing record %s into %s"
msgstr ""
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, c-format
msgid "error(%d) removing record %s from %s"
msgstr ""
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, c-format
msgid "error(%d) counting packages"
msgstr ""
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 lib/uninstall.c:97
#, c-format
msgid "%s: cannot read header at 0x%x"
msgstr ""
-#: lib/rpmdb.c:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, c-format
msgid "error(%d) allocating new package instance"
msgstr ""
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1952
#, c-format
-msgid "adding %d entries to %s index:\n"
+msgid "adding %d entries to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr ""
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr ""
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr ""
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index 3c2e27fc9..19aae58de 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-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -3048,17 +3048,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr ""
+
+#: lib/rpmdb.c:293
#, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr ""
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3068,7 +3072,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3078,7 +3082,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3089,136 +3093,136 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr ""
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, c-format
msgid "error(%d) storing record %s into %s"
msgstr ""
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, c-format
msgid "error(%d) removing record %s from %s"
msgstr ""
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, c-format
msgid "error(%d) counting packages"
msgstr ""
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 lib/uninstall.c:97
#, c-format
msgid "%s: cannot read header at 0x%x"
msgstr ""
-#: lib/rpmdb.c:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, c-format
msgid "error(%d) allocating new package instance"
msgstr ""
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1952
#, c-format
-msgid "adding %d entries to %s index:\n"
+msgid "adding %d entries to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr ""
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr ""
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr ""
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index cbdd77272..24338cbd6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
msgid ""
msgstr ""
-"POT-Creation-Date: 2000-07-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-0400\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=koi8-r\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -3214,17 +3214,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, fuzzy, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr "ÎĹ ÍĎÇŐ ĎÔËŇŮÔŘ %s ÎÁ %s:%d"
+
+#: lib/rpmdb.c:293
#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr "ÎĹ ÍĎÇŐ ĎÔËŇŮÔŘ %s\n"
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3234,7 +3238,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3244,7 +3248,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3255,26 +3259,26 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr "ĎŰÉÂËÁ ĐĎĚŐŢĹÎÉŃ ÚÁĐÉÓÉ %s ÉÚ %s"
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s"
msgstr "ĎŰÉÂËÁ ÓĎČŇÁÎĹÎÉŃ ÚÁĐÉÓÉ %s × %s"
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, fuzzy, c-format
msgid "error(%d) removing record %s from %s"
msgstr "ĎŰÉÂËÁ ŐÄÁĚĹÎÉŃ ÚÁĐÉÓÉ %s ÉÚ %s"
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr "ÎĹ ŐÓÔÁÎĎ×ĚĹÎÁ dbpath"
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
@@ -3283,111 +3287,111 @@ msgstr ""
"ÂÁÚŮ ÎĎ×ĎÇĎ ĆĎŇÍÁÔÁ"
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, fuzzy, c-format
msgid "error(%d) counting packages"
msgstr "ĎŰÉÂËÁ ĐŇÉ ĐĎÉÓËĹ ĐÁËĹÔÁ %s\n"
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 lib/uninstall.c:97
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x"
msgstr "ÎĹ ÍĎÇŐ ĐŇĎŢĹÓÔŘ ČĹÄĹŇ × %d ÄĚŃ ĐĎÉÓËÁ"
-#: lib/rpmdb.c:1701
+#: lib/rpmdb.c:1708
#, fuzzy, c-format
msgid "removing 0 %s entries.\n"
msgstr "ŐÄÁĚŃŔ ÚÁĐÉÓŘ ÂÁÚŮ ÄÁÎÎŮČ\n"
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "ŐÄÁĚŃŔ ÉÎÄĹËÓ ÇŇŐĐĐ\n"
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, fuzzy, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr "ŐÄÁĚŃŔ ÉÎÄĹËÓ ÉÍĹÎ\n"
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, fuzzy, c-format
msgid "error(%d) allocating new package instance"
msgstr "ĎŰÉÂËÁ ĐŇÉ ĐĎÉÓËĹ ĐÁËĹÔÁ %s\n"
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "ĐĹŇĹÉÍĹÎĎ×Ů×ÁŔ %s × %s\n"
-#: lib/rpmdb.c:1945
-#, c-format
-msgid "adding %d entries to %s index:\n"
-msgstr ""
+#: lib/rpmdb.c:1952
+#, fuzzy, c-format
+msgid "adding %d entries to %s index.\n"
+msgstr "ĐĹŇĹÉÍĹÎĎ×Ů×ÁŔ %s × %s\n"
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "ĐĹŇĹÓÔŇÁÉ×ÁŔ ÂÁÚŐ × ËĎŇÎĹ×ĎÍ ËÁÔÁĚĎÇĹ %s\n"
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr "×ŇĹÍĹÎÎÁŃ ÂÁÚÁ ÄÁÎÎŮČ %s ŐÖĹ ÓŐÝĹÓÔ×ŐĹÔ"
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "ÓĎÚÄÁŔ ËÁÔÁĚĎÇ: %s\n"
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr "ĎŰÉÂËÁ ÓĎÚÄÁÎÉŃ ËÁÔÁĚĎÇÁ %s: %s"
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "ĎÔËŇŮ×ÁŔ ÓÔÁŇŐŔ ÂÁÚŐ\n"
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "ĎÔËŇŮ×ÁŔ ÎĎ×ŐŔ ÂÁÚŐ\n"
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, fuzzy, c-format
msgid "record number %d in database is bad -- skipping."
msgstr "ÚÁĐÉÓŘ ÎĎÍĹŇ %d × ÂÁÚĹ ÎĹ×ĹŇÎÁ, ĐŇĎĐŐÓËÁŔ"
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr "ÎĹ ÍĎÇŐ ÄĎÂÁ×ÉÔŘ ÚÁĐÉÓŘ (ĐĹŇ×ĎÎÁŢÁĚŘÎĎ × %d)"
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
#, fuzzy
msgid "failed to rebuild database: original database remains in place\n"
msgstr "ĐĹŇĹÓÔŇĎĹÎÉĹ ÂÁÚŮ ÎĹ ŐÄÁĚĎÓŘ, ÓÔÁŇÁŃ ÂÁÚÁ ĎÓÔÁĹÔÓŃ ÎÁ ÍĹÓÔĹ\n"
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr "ÚÁÍĹÎÁ ÓÔÁŇĎĘ ÂÁÚŮ ÎÁ ÎĎ×ŐŔ ÎĹ ŐÄÁĚÁÓŘ!\n"
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "ÄĚŃ ×ĎÓÓÔÁÎĎ×ĚĹÎÉŃ ÚÁÍĹÎŃĹÔ ĆÁĘĚŮ × %s ĆÁĘĚÁÍÉ ÉÚ %s"
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "ÓĎÚÄÁŔ ËÁÔÁĚĎÇ: %s\n"
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, 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 cfce055e0..fbed4e362 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-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -3222,17 +3222,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, fuzzy, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr "nie je možné otvoriť %s na %s:%d"
+
+#: lib/rpmdb.c:293
#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr "nie je možné otvoriť %s\n"
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3242,7 +3246,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3252,7 +3256,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3263,26 +3267,26 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, 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:515
+#: lib/rpmdb.c:522
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s"
msgstr "chyba pri zápise záznamu %s do %s"
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, fuzzy, c-format
msgid "error(%d) removing record %s from %s"
msgstr "chyba pri odstraňovaní záznamu %s z %s"
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr "nebola nastavená žiadna dbpath"
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
@@ -3291,111 +3295,111 @@ msgstr ""
"databázy v novom formáte"
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, fuzzy, c-format
msgid "error(%d) counting packages"
msgstr "chyba pri hľadaní balíka %s\n"
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 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:1701
+#: lib/rpmdb.c:1708
#, fuzzy, c-format
msgid "removing 0 %s entries.\n"
msgstr "odstraňuje sa záznam z databázy\n"
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "odstraňuje sa index skupín\n"
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, fuzzy, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr "odstraňuje sa index názvov\n"
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, fuzzy, c-format
msgid "error(%d) allocating new package instance"
msgstr "chyba pri hľadaní balíka %s\n"
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "premenováva sa %s na %s\n"
-#: lib/rpmdb.c:1945
-#, c-format
-msgid "adding %d entries to %s index:\n"
-msgstr ""
+#: lib/rpmdb.c:1952
+#, fuzzy, c-format
+msgid "adding %d entries to %s index.\n"
+msgstr "premenováva sa %s na %s\n"
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, 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:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr "dočasná databáza %s už existuje"
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "vytvára sa adresár %s\n"
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr "chyba pri vytváraní adresára %s: %s"
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "otvára sa stará databáza\n"
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "otvára sa nová databáza\n"
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, 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:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr "nie je možné pridať záznam pôvodne na %d"
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
#, 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:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr "nepodarilo sa nahradiť starú databázu novou!\n"
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, 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:2425
+#: lib/rpmdb.c:2433
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "vytvára sa adresár %s\n"
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, 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 de8f13a27..98e71cacc 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.87 2000/07/29 13:16:47 jbj Exp $
+# $Id: sl.po,v 1.88 2000/07/29 17:30:21 jbj Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-07-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -3207,17 +3207,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, fuzzy, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr "ni možno odpreti %s v %s:%d: %s"
+
+#: lib/rpmdb.c:293
#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr "ni možno odpreti %s: %s\n"
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3227,7 +3231,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3237,7 +3241,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3248,138 +3252,138 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr "napaka pri branju zapisa %s iz %s"
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s"
msgstr "napaka pri pisanju zapisa %s v %s"
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, fuzzy, c-format
msgid "error(%d) removing record %s from %s"
msgstr "napaka pri brisanju zapisa %s iz %s"
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr "dbpath ni nastavljena"
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
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:1070
+#: lib/rpmdb.c:1077
#, fuzzy, c-format
msgid "error(%d) counting packages"
msgstr "napaka pri iskanju paketa %s\n"
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 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:1701
+#: lib/rpmdb.c:1708
#, fuzzy, c-format
msgid "removing 0 %s entries.\n"
msgstr "odstranjujemo vnose v podatkovni zbirki\n"
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "odstranjujemo seznam skupin\n"
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, fuzzy, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr "odstranjujemo seznam imen\n"
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, fuzzy, c-format
msgid "error(%d) allocating new package instance"
msgstr "napaka pri iskanju paketa %s\n"
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "preimenujemo %s v %s\n"
-#: lib/rpmdb.c:1945
-#, c-format
-msgid "adding %d entries to %s index:\n"
-msgstr ""
+#: lib/rpmdb.c:1952
+#, fuzzy, c-format
+msgid "adding %d entries to %s index.\n"
+msgstr "preimenujemo %s v %s\n"
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n"
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr "začasna podatkovna zbirka %s že obstaja"
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "ustvarjamo imenik: %s\n"
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr "napaka pri ustvarjanju imenika %s: %s"
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "odpiramo staro podatkovno zbirko\n"
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "odpiramo novo podatkovno zbirko\n"
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr "zapis št. %d v zbirki je okvarjen -- preskakujemo."
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr "zapisa ni možno dodati na %d"
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
#, 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:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr "zamenjava stare podatkovne zbirke z novo neuspešna!\n"
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, 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:2425
+#: lib/rpmdb.c:2433
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "ustvarjamo imenik: %s\n"
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, 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 4c817b672..dd44bb03b 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
msgid ""
msgstr ""
-"POT-Creation-Date: 2000-07-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -3243,17 +3243,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, fuzzy, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr "Ne mogu da otvorim datoteku %s: "
+
+#: lib/rpmdb.c:293
#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr "greška: ne mogu da otvorim %s\n"
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3263,7 +3267,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3273,7 +3277,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3284,136 +3288,136 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr "greška kod uzimanja sloga %s iz %s"
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s"
msgstr "greška zapisivanja sloga %s u %s"
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, fuzzy, c-format
msgid "error(%d) removing record %s from %s"
msgstr "greška uklanjanja sloga %s u %s"
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr "dbpath nije određen"
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, fuzzy, c-format
msgid "error(%d) counting packages"
msgstr "greška kod potrage za paketom %s\n"
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 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:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "greška uklanjanja sloga %s u %s"
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, fuzzy, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr "greška uklanjanja sloga %s u %s"
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, fuzzy, c-format
msgid "error(%d) allocating new package instance"
msgstr "greška kod potrage za paketom %s\n"
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1945
-#, c-format
-msgid "adding %d entries to %s index:\n"
-msgstr ""
+#: lib/rpmdb.c:1952
+#, fuzzy, c-format
+msgid "adding %d entries to %s index.\n"
+msgstr "greška uklanjanja sloga %s u %s"
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "rekreiraj bazu podataka iz postojeće baze"
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr "privremena baza podataka %s već postoji"
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "greška kod kreiranja direktorijuma %s: %s"
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr "greška kod kreiranja direktorijuma %s: %s"
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "rekreiraj bazu podataka iz postojeće baze"
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "rekreiraj bazu podataka iz postojeće baze"
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, 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:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr "ne mogu da dodam slog originalno na %d"
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "greška kod kreiranja direktorijuma %s: %s"
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, 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 15c718499..c936bd756 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,6 +1,6 @@
msgid ""
msgstr ""
-"POT-Creation-Date: 2000-07-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-0400\n"
"PO-Revision-Date: 2000-07-24 22:14+0200\n"
"Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -3102,23 +3102,27 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
"\n"
"--> Denna version av rpm kompilerades inte med stöd för \"%%_dbapi %d\".\n"
" Verifiera inställningen av makrot %%_dbapi med \"rpm --showrc\" och\n"
-" konfigurera \"%%_dbapi -1\" (d.v.s. skapa och/eller editera "
+" konfigurera \"%%_dbapi 3\" (d.v.s. skapa och/eller editera "
"/etc/rpm/macros).\n"
"\n"
-#: lib/rpmdb.c:290
-#, c-format
-msgid "dbiOpen: cannot open %s index"
+#: lib/rpmdb.c:273
+#, fuzzy, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr "kan inte öppna %s vid %s:%d: %s"
+
+#: lib/rpmdb.c:293
+#, fuzzy, c-format
+msgid "cannot open %s index"
msgstr "dbiOpen: kan inte öppna %s-index"
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3133,7 +3137,7 @@ msgstr ""
" till db%d-format genom att köra \"rpm --rebuilddb\" som root.\n"
"\n"
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3149,7 +3153,7 @@ msgstr ""
"/etc/rpm/macros).\n"
"\n"
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3168,26 +3172,26 @@ msgstr ""
"/etc/rpm/macros).\n"
"\n"
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, 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:515
+#: lib/rpmdb.c:522
#, c-format
msgid "error(%d) storing record %s into %s"
msgstr "fel(%d) när post %s sparades i %s"
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, c-format
msgid "error(%d) removing record %s from %s"
msgstr "fel(%d) när post %s togs bort ur %s"
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr "ingen dbpath har satts"
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
@@ -3196,110 +3200,110 @@ msgstr ""
"i nytt format"
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, c-format
msgid "error(%d) counting packages"
msgstr "fel(%d) när paket räknades"
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 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:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr "tar bort 0 %s-poster.\n"
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "tar bort \"%s\" frĺn %s-index.\n"
-#: lib/rpmdb.c:1721
-#, c-format
-msgid "removing %d entries from %s index:\n"
+#: lib/rpmdb.c:1728
+#, fuzzy, c-format
+msgid "removing %d entries from %s index.\n"
msgstr "tar bort %d poster frĺn %s-index:\n"
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, c-format
msgid "error(%d) allocating new package instance"
msgstr "fel(%d) vid allokering av ny paketinstans"
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr "lägger till 0 %s-poster.\n"
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "lägger till \"%s\" till %s-index.\n"
-#: lib/rpmdb.c:1945
-#, c-format
-msgid "adding %d entries to %s index:\n"
+#: lib/rpmdb.c:1952
+#, fuzzy, c-format
+msgid "adding %d entries to %s index.\n"
msgstr "lägger till %d poster till %s-index:\n"
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "bygger om databas %s till %s\n"
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr "tillfällig databas %s existerar redan"
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, c-format
msgid "creating directory %s\n"
msgstr "skapar katalog %s\n"
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr "fel när katalog skapades %s: %s"
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "öppnar gammal databas med dbapi %d\n"
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "öppnar ny databas med dbapi %d\n"
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, 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:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr "kan inte lägga till post ursprungligen vid %d"
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n"
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr "kunde inte ersätta gammal databas med ny databas!\n"
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, 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:2425
+#: lib/rpmdb.c:2433
#, c-format
msgid "removing directory %s\n"
msgstr "tar bort katalog %s\n"
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "kunde inte ta bort katalogen %s: %s\n"
diff --git a/po/tr.po b/po/tr.po
index 520c0eaa9..04f0ecdc2 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-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -3289,17 +3289,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, fuzzy, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr "%s dosyasý açýlamýyor: "
+
+#: lib/rpmdb.c:293
#, fuzzy, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr "hata: %s eriţilemiyor\n"
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3309,7 +3313,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3319,7 +3323,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3330,136 +3334,136 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr "%s kaydýna %s dosyasýnda eriţilemiyor:"
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s"
msgstr "%s kaydý %s dosyasýna yazýlamýyor"
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, fuzzy, c-format
msgid "error(%d) removing record %s from %s"
msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr "dbpath deđeri girilmemiţ"
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, fuzzy, c-format
msgid "error(%d) counting packages"
msgstr "%s pakedi aranýrken hata oluţtu\n"
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 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:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, fuzzy, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, fuzzy, c-format
msgid "error(%d) allocating new package instance"
msgstr "%s pakedi aranýrken hata oluţtu\n"
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1945
-#, c-format
-msgid "adding %d entries to %s index:\n"
-msgstr ""
+#: lib/rpmdb.c:1952
+#, fuzzy, c-format
+msgid "adding %d entries to %s index.\n"
+msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, 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:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr "geçici veritabaný %s mevcut"
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "%s dizinin oluţturulmasýnda hata: %s"
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr "%s dizinin oluţturulmasýnda hata: %s"
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, 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:2332
+#: lib/rpmdb.c:2340
#, 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:2355
+#: lib/rpmdb.c:2363
#, 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:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr "%d de yer alan kayýt saklayamýyor"
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "%s dizinin oluţturulmasýnda hata: %s"
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, 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 3c2e27fc9..19aae58de 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-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -3048,17 +3048,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr ""
+
+#: lib/rpmdb.c:293
#, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr ""
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3068,7 +3072,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3078,7 +3082,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3089,136 +3093,136 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr ""
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, c-format
msgid "error(%d) storing record %s into %s"
msgstr ""
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, c-format
msgid "error(%d) removing record %s from %s"
msgstr ""
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, c-format
msgid "error(%d) counting packages"
msgstr ""
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 lib/uninstall.c:97
#, c-format
msgid "%s: cannot read header at 0x%x"
msgstr ""
-#: lib/rpmdb.c:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, c-format
msgid "error(%d) allocating new package instance"
msgstr ""
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1952
#, c-format
-msgid "adding %d entries to %s index:\n"
+msgid "adding %d entries to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr ""
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr ""
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr ""
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 3c2e27fc9..19aae58de 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -3048,17 +3048,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr ""
+
+#: lib/rpmdb.c:293
#, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr ""
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3068,7 +3072,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3078,7 +3082,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3089,136 +3093,136 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr ""
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, c-format
msgid "error(%d) storing record %s into %s"
msgstr ""
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, c-format
msgid "error(%d) removing record %s from %s"
msgstr ""
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, c-format
msgid "error(%d) counting packages"
msgstr ""
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 lib/uninstall.c:97
#, c-format
msgid "%s: cannot read header at 0x%x"
msgstr ""
-#: lib/rpmdb.c:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, c-format
msgid "error(%d) allocating new package instance"
msgstr ""
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1952
#, c-format
-msgid "adding %d entries to %s index:\n"
+msgid "adding %d entries to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr ""
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr ""
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr ""
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 3c2e27fc9..19aae58de 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -3048,17 +3048,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr ""
+
+#: lib/rpmdb.c:293
#, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr ""
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3068,7 +3072,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3078,7 +3082,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3089,136 +3093,136 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr ""
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, c-format
msgid "error(%d) storing record %s into %s"
msgstr ""
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, c-format
msgid "error(%d) removing record %s from %s"
msgstr ""
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, c-format
msgid "error(%d) counting packages"
msgstr ""
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 lib/uninstall.c:97
#, c-format
msgid "%s: cannot read header at 0x%x"
msgstr ""
-#: lib/rpmdb.c:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, c-format
msgid "error(%d) allocating new package instance"
msgstr ""
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1952
#, c-format
-msgid "adding %d entries to %s index:\n"
+msgid "adding %d entries to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr ""
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr ""
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr ""
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 3c2e27fc9..19aae58de 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-28 17:49-0400\n"
+"POT-Creation-Date: 2000-07-29 13:25-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"
@@ -3048,17 +3048,21 @@ msgid ""
"\n"
"--> This version of rpm was not compiled with support for \"%%_dbapi %d\".\n"
" Please verify the setting of the macro %%_dbapi using \"rpm --showrc\"\n"
-" and configure \"%%_dbapi -1\" (e.g. create and/or edit "
-"/etc/rpm/macros).\n"
+" and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
"\n"
msgstr ""
-#: lib/rpmdb.c:290
+#: lib/rpmdb.c:273
+#, c-format
+msgid "cannot open %s index using db%d - %s (%d)"
+msgstr ""
+
+#: lib/rpmdb.c:293
#, c-format
-msgid "dbiOpen: cannot open %s index"
+msgid "cannot open %s index"
msgstr ""
-#: lib/rpmdb.c:301
+#: lib/rpmdb.c:308
#, c-format
msgid ""
"\n"
@@ -3068,7 +3072,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:314
+#: lib/rpmdb.c:321
msgid ""
"\n"
"--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3078,7 +3082,7 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:329
+#: lib/rpmdb.c:336
msgid ""
"\n"
"--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3089,136 +3093,136 @@ msgid ""
"\n"
msgstr ""
-#: lib/rpmdb.c:397
+#: lib/rpmdb.c:404
#, c-format
msgid "error(%d) getting \"%s\" records from %s index"
msgstr ""
-#: lib/rpmdb.c:515
+#: lib/rpmdb.c:522
#, c-format
msgid "error(%d) storing record %s into %s"
msgstr ""
-#: lib/rpmdb.c:524
+#: lib/rpmdb.c:531
#, c-format
msgid "error(%d) removing record %s from %s"
msgstr ""
-#: lib/rpmdb.c:759 lib/rpmdb.c:2279
+#: lib/rpmdb.c:766 lib/rpmdb.c:2285
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:858
+#: lib/rpmdb.c:865
msgid ""
"old format database is present; use --rebuilddb to generate a new format "
"database"
msgstr ""
#. error
-#: lib/rpmdb.c:1070
+#: lib/rpmdb.c:1077
#, c-format
msgid "error(%d) counting packages"
msgstr ""
-#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
+#: lib/rpmdb.c:1136 lib/rpmdb.c:1655 lib/uninstall.c:97
#, c-format
msgid "%s: cannot read header at 0x%x"
msgstr ""
-#: lib/rpmdb.c:1701
+#: lib/rpmdb.c:1708
#, c-format
msgid "removing 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1712
+#: lib/rpmdb.c:1719
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1721
+#: lib/rpmdb.c:1728
#, c-format
-msgid "removing %d entries from %s index:\n"
+msgid "removing %d entries from %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1863
+#: lib/rpmdb.c:1870
#, c-format
msgid "error(%d) allocating new package instance"
msgstr ""
-#: lib/rpmdb.c:1920
+#: lib/rpmdb.c:1927
#, c-format
msgid "adding 0 %s entries.\n"
msgstr ""
-#: lib/rpmdb.c:1936
+#: lib/rpmdb.c:1943
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:1945
+#: lib/rpmdb.c:1952
#, c-format
-msgid "adding %d entries to %s index:\n"
+msgid "adding %d entries to %s index.\n"
msgstr ""
-#: lib/rpmdb.c:2304
+#: lib/rpmdb.c:2310
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: lib/rpmdb.c:2308
+#: lib/rpmdb.c:2314
#, c-format
msgid "temporary database %s already exists"
msgstr ""
-#: lib/rpmdb.c:2314
+#: lib/rpmdb.c:2320
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2316
+#: lib/rpmdb.c:2322
#, c-format
msgid "error creating directory %s: %s"
msgstr ""
-#: lib/rpmdb.c:2323
+#: lib/rpmdb.c:2329
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2332
+#: lib/rpmdb.c:2340
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: lib/rpmdb.c:2355
+#: lib/rpmdb.c:2363
#, c-format
msgid "record number %d in database is bad -- skipping."
msgstr ""
-#: lib/rpmdb.c:2387
+#: lib/rpmdb.c:2395
#, c-format
msgid "cannot add record originally at %d"
msgstr ""
-#: lib/rpmdb.c:2405
+#: lib/rpmdb.c:2413
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2421
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2423
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: lib/rpmdb.c:2425
+#: lib/rpmdb.c:2433
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: lib/rpmdb.c:2427
+#: lib/rpmdb.c:2435
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/rpm.spec b/rpm.spec
index 84a351c5b..6b4ec0ecc 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -263,6 +263,7 @@ fi
%changelog
* Sat Jul 29 2000 Jeff Johnson <jbj@redhat.com>
- bail on firstkey/nextkey, there's a better way.
+- link rpm2cpio dynamically since cpio is linked dynamically.
* Fri Jul 28 2000 Jeff Johnson <jbj@redhat.com>
- resurrect firstkey/nextkey python bindings.