- fix: make set of replaced file headers unique.

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

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

diff --git a/CHANGES b/CHANGES
index 7c940b4..c6f08e3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -92,6 +92,8 @@
        - remove (dead) rpmdb API code in python bindings.
        - remove (legacy) support for version 1 packaging.
        - remove (legacy) support for converting gdbm databases.
+       - fix: make set of replaced file headers unique.
+       - fix: don't attempt dbiOpen with anything but requested dbN.
 
 3.0.4 -> 3.0.5
        - handle version 4 packaging as input.

diff --git a/lib/install.c b/lib/install.c
index a7d8b5f..d35b17c 100644 (file)
--- a/lib/install.c
+++ b/lib/install.c
@@ -7,6 +7,7 @@
 #include "cpio.h"
 #include "install.h"
 #include "misc.h"
+#include <assert.h>
 
 struct callbackInfo {
     unsigned long archiveSize;
@@ -415,13 +416,25 @@ static int markReplacedFiles(rpmdb db, const struct sharedFileInfo * replList)
     rpmdbMatchIterator mi;
     Header h;
     unsigned int * offsets;
+    unsigned int prev;
     int num;
 
-    for (num = 0, fileInfo = replList; fileInfo->otherPkg; fileInfo++)
+    num = prev = 0;
+    for (fileInfo = replList; fileInfo->otherPkg; fileInfo++) {
+       if (prev && prev == fileInfo->otherPkg)
+           continue;
+       prev = fileInfo->otherPkg;
        num++;
+    }
+
     offsets = alloca(num * sizeof(*offsets));
-    for (num = 0, fileInfo = replList; fileInfo->otherPkg; fileInfo++)
+    num = prev = 0;
+    for (fileInfo = replList; fileInfo->otherPkg; fileInfo++) {
+       if (prev && prev == fileInfo->otherPkg)
+           continue;
+       prev = fileInfo->otherPkg;
        offsets[num++] = fileInfo->otherPkg;
+    }
 
     mi = rpmdbInitIterator(db, RPMDBI_PACKAGES, NULL, 0);
     rpmdbAppendIterator(mi, offsets, num);
@@ -435,8 +448,9 @@ static int markReplacedFiles(rpmdb db, const struct sharedFileInfo * replList)
        headerGetEntry(h, RPMTAG_FILESTATES, NULL, (void **)&secStates, &count);
        
        modified = 0;
-       while ( fileInfo->otherPkg &&
-               fileInfo->otherPkg == rpmdbGetIteratorOffset(mi)) {
+       prev = rpmdbGetIteratorOffset(mi);
+       while (fileInfo->otherPkg && fileInfo->otherPkg == prev) {
+           assert(fileInfo->otherFileNum < count);
            secStates[fileInfo->otherFileNum] = RPMFILE_STATE_REPLACED;
            modified = 1;
            fileInfo++;

diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index c698898..0396f81 100644 (file)
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -266,9 +266,7 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, /*@unused@*/ unsigned int flags)
        errno = 0;
        dbi = NULL;
        rc = (*mydbvecs[_dbapi]->open) (rpmdb, rpmtag, &dbi);
-       if (rc == 0 && dbi)
-           break;
-       /*@fallthrough@*/
+       break;
     case -1:
        _dbapi = 4;
        while (_dbapi-- > 1) {
@@ -301,12 +299,11 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, /*@unused@*/ unsigned int flags)
        rc = (_rebuildinprogress ? 0 : 1);
        if (rc && !_printed++)
            fprintf(stderr, _("\n\
---> The rpm database is in db%d format, not the suggested db%d format.\n\
+--> The rpm database cannot be opened in db%d format.\n\
     If you have just upgraded the rpm package you need to convert\n\
     your database to db%d format by running \"rpm --rebuilddb\" as root.\n\
 \n\
-"),    _dbapi, (_dbapi_rebuild > 0 ? _dbapi_rebuild : 3),
-       (_dbapi_rebuild > 0 ? _dbapi_rebuild : 3));
+"),    _dbapi, (_dbapi_rebuild > 0 ? _dbapi_rebuild : 3));
        goto exit;
     }
 
@@ -341,29 +338,6 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, /*@unused@*/ unsigned int flags)
        goto exit;
     }
 
-    /* Two co-resident databases. */
-    if (rc == 0 && dbi) {
-       const char * pkgs = rpmGenPath(rpmdb->db_root, "%{_dbpath}/", "packages.rpm");
-       static int _printed = 0;
-
-       rc = (_dbapi > 1 && rpmfileexists(pkgs) && !_rebuildinprogress);
-       if (rc && !_printed++)
-               fprintf(stderr, _("\n\
---> An rpm database in db1 format exists in %s.\n\
-    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n\
-\n\
-"),    pkgs, (_dbapi_rebuild > 0 ? _dbapi_rebuild : 3));
-       if (rc && dbi) {
-           xfree(pkgs);
-           pkgs = rpmGenPath( dbi->dbi_root, dbi->dbi_home,
-               (dbi->dbi_file ? dbi->dbi_file : tagName(dbi->dbi_rpmtag)));
-           dbiClose(dbi, 0);
-           unlink(pkgs);
-       }
-       xfree(pkgs);
-       goto exit;
-    }
-
 exit:
     if (rc == 0 && dbi) {
        rpmdb->_dbi[dbix] = dbi;

diff --git a/po/cs.po b/po/cs.po
index 1a0a626..94507d9 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: 1998-10-10 10:10+0200\n"
 "Last-Translator: Pavel Makovec <pavelm@terminal.cz>\n"
 "Language-Team: Czech <pavelm@terminal.cz>\n"
@@ -2627,7 +2627,7 @@ msgstr "soubor %s je na nezn
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "Poèet RPM_STRING_TYPE pro grabData() musí být 1.\n"
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datový typ %d není podporován\n"
@@ -2698,111 +2698,111 @@ msgstr "na konci v
 msgid "(unknown type)"
 msgstr "(neznámý typ)"
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, fuzzy, c-format
 msgid "   file: %s action: %s\n"
 msgstr "soubor %s: %s\n"
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "probíhá instalace binárních balíèkù\n"
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "nelze otevøít soubor %s: "
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "nelze otevøít soubor %s: "
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "nelze otevøít soubor %s: "
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, fuzzy, c-format
 msgid "spec file in: %s\n"
 msgstr "soubor %s: %s\n"
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "balíèek %s neobsahuje soubory"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, fuzzy, c-format
 msgid "renaming %s to %s\n"
 msgstr "Probíhá získávání %s jako %s\n"
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "%s nelze pøejmenovat na %s: %s"
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "balíèek %s-%s-%s obsahuje sdílení soubory\n"
 
-#: lib/install.c:950
+#: lib/install.c:964
 #, fuzzy
 msgid "stopping install as we're running --test\n"
 msgstr "probíhá zastavení zdrojové instalace, nebo» jde jen o testování\n"
 
-#: lib/install.c:955
+#: lib/install.c:969
 #, fuzzy
 msgid "running preinstall script (if any)\n"
 msgstr "spou¹tí se pøípadný poinstalaèní skript\n"
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 #, fuzzy
 msgid "running postinstall scripts (if any)\n"
 msgstr "spou¹tí se pøípadný poinstalaèní skript\n"
@@ -3310,22 +3310,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "chyba: nelze otevøít %s\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3335,7 +3335,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3346,146 +3346,137 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "chyba pøi získávání záznamu %s z %s"
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "chyba pøi ukládání záznamu %s do %s"
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "chyba pøi odstraòování záznamu %s do %s"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "nebyla nastavena dbpath"
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "chyba pøi hledání balíèku %s\n"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "nelze èíst hlavièku u %d pro vyhledání"
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "odstraòuje se polo¾ka databáze\n"
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstraòuje se rejstøík skupin\n"
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "odstraòuje se rejstøík názvù\n"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "chyba pøi hledání balíèku %s\n"
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "Probíhá získávání %s jako %s\n"
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "databáze se pøestavuje v koøenovém adresáøi %s\n"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "doèasná databáze %s ji¾ existuje"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "vytváøí se adresáø: %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "chyba pøi vytváøení adresáøe %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otevírá se stará databáze\n"
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otevírá se nová databáze\n"
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "záznam èíslo %d v databázi je chybný -- vynechává se"
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "nelze pøidat záznam - pùvodnì u %d"
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "databázi nelze pøestavit; pùvodní databáze zùstává na svém místì\n"
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr "starou databázi nelze nahradit novou databází!\n"
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "aby se obnovily, nahrazuje soubory v %s soubory z %s"
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "vytváøí se adresáø: %s\n"
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "nelze odstranit %s: %s\n"

diff --git a/po/da.po b/po/da.po
index cb5846b..fdf0383 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
@@ -2472,7 +2472,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2543,107 +2543,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3115,22 +3115,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3140,7 +3140,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3151,145 +3151,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/de.po b/po/de.po
index d17ffc8..d7ea44b 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.5.2\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -2723,7 +2723,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2798,111 +2798,111 @@ msgid "(unknown type)"
 msgstr "(unbekannter Typ)"
 
 # , c-format
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, fuzzy, c-format
 msgid "   file: %s action: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "Paket installieren"
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "kann Datei %s nicht öffnen: "
 
 # , c-format
-#: lib/install.c:662
+#: lib/install.c:676
 #, fuzzy, c-format
 msgid "spec file in: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "umbennen von %s nach %s fehlgeschlagen: %s"
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
 # FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/install.c:890
+#: lib/install.c:904
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3418,22 +3418,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "Fehler: kann %s nicht öffnen\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3443,7 +3443,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3454,150 +3454,141 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "Fehler beim Eintrag %s von %s"
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
 
 # FIXME
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "»dbpath« ist nicht gesetzt"
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen"
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
 # FIXME
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
 # FIXME
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "die temporäre Datenbank %s existiert schon"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 "Eintrag Nummer %d in der Datenback ist nicht in Ordnung -- wird übersprungen"
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d"
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
 # , c-format
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"

diff --git a/po/es.po b/po/es.po
index 35f0750..282bbe2 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2457,7 +2457,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2528,107 +2528,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3100,22 +3100,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3125,7 +3125,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3136,145 +3136,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/fi.po b/po/fi.po
index 0da3fc5..8dd753d 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -2659,7 +2659,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2732,109 +2732,109 @@ msgstr "odotin '}'-merkki
 msgid "(unknown type)"
 msgstr "(tuntematon tyyppi)"
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, fuzzy, c-format
 msgid "   file: %s action: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "asenna paketti"
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, fuzzy, c-format
 msgid "spec file in: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "%s:n nimeäminen %s:ksi epäonnistui: %s"
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3342,22 +3342,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "virhe: en voi avata %s\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3367,7 +3367,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3378,145 +3378,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "virhe luettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "virhe talletettaessa tietuetta %s %s:ään"
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "dbpath ei ole asetettu"
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "en voi lukea headeria %d:stä päivittäessä"
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "väliaikainen tietokanta %s on jo olemassa"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen"
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "en voi lisätä tietuetta %d:stä"
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "en voinut avata %s: %s"

diff --git a/po/fr.po b/po/fr.po
index 695e64d..296a437 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-07-15 10:39-0400\n"
+msgstr "POT-Creation-Date: 2000-07-15 11:53-0400\n"
 
 #: build.c:25 lib/rpminstall.c:451
 #, c-format
@@ -2652,7 +2652,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2725,109 +2725,109 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3334,22 +3334,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3359,7 +3359,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3370,145 +3370,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"

diff --git a/po/gl.po b/po/gl.po
index 35f0750..282bbe2 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2457,7 +2457,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2528,107 +2528,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3100,22 +3100,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3125,7 +3125,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3136,145 +3136,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/hu.po b/po/hu.po
index 35f0750..282bbe2 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2457,7 +2457,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2528,107 +2528,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3100,22 +3100,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3125,7 +3125,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3136,145 +3136,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/id.po b/po/id.po
index 35f0750..282bbe2 100644 (file)
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2457,7 +2457,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2528,107 +2528,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3100,22 +3100,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3125,7 +3125,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3136,145 +3136,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/is.po b/po/is.po
index f5618d4..88d6266 100644 (file)
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 1.0\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: 2000-06-16 02:20+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -2452,7 +2452,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2523,107 +2523,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3095,22 +3095,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3120,7 +3120,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3131,145 +3131,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/it.po b/po/it.po
index 35f0750..282bbe2 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2457,7 +2457,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2528,107 +2528,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3100,22 +3100,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3125,7 +3125,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3136,145 +3136,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/ja.po b/po/ja.po
index 85be298..2eec04b 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.4\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -127,7 +127,7 @@ msgstr "copyright 
 # build root [BuildRoot]
 # net share [¥Í¥Ã¥È¶¦Í­]
 # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë]
-# $Id: ja.po,v 1.94 2000/07/15 14:53:57 jbj Exp $
+# $Id: ja.po,v 1.95 2000/07/15 16:00:15 jbj Exp $
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2606,7 +2606,7 @@ msgstr "
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabDate() RPM_STRING_TYPE ¥«¥¦¥ó¥È¤Ï 1 ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n"
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "¥Ç¡¼¥¿¥¿¥¤¥× %d ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
@@ -2677,22 +2677,22 @@ msgstr "
 msgid "(unknown type)"
 msgstr "(ÉÔÌÀ¤Ê¥¿¥¤¥×)"
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, fuzzy, c-format
 msgid "   file: %s action: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s: ¥¢¥¯¥·¥ç¥ó: %s\n"
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr "¥æ¡¼¥¶ %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹"
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr "¥°¥ë¡¼¥× %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹"
 
-#: lib/install.c:204
+#: lib/install.c:205
 #, fuzzy
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
@@ -2701,87 +2701,87 @@ msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿­Ä¹¤Ë¼ºÇÔ %s%s: %s"
 
-#: lib/install.c:558
+#: lib/install.c:572
 #, fuzzy
 msgid " on file "
 msgstr "¥Õ¥¡¥¤¥ë¾å"
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤Þ¤¹\n"
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "%s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr "%s ¤Ø½ñ¤­¹þ¤á¤Þ¤»¤ó"
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr "¥½¡¼¥¹¤Ï: %s\n"
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "%s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "spec ¥Õ¥¡¥¤¥ë¤Ï: %s\n"
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n"
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "%s ¤ò %s ¤Ë¤¹¤ë̾Á°¤ÎÊѹ¹¤Ë¼ºÇÔ: %s"
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Þ¤¹¡¢¥Ð¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Þ¤·¤¿"
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr "--test ¤ò¼Â¹Ô¤¹¤ë¤è¤¦¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤òÃæ»ß¤·¤Æ¤¤¤Þ¤¹\n"
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr "¥×¥ê¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n"
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "·Ù¹ð: %s ¤Ï %s ¤È¤·¤ÆºîÀ®¤µ¤ì¤Þ¤¹"
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "·Ù¹ð: %s ¤Ï %s ¤È¤·¤ÆÊݸ¤µ¤ì¤Þ¤¹"
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 #, fuzzy
 msgid "running postinstall scripts (if any)\n"
 msgstr "¥Ý¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n"
@@ -3296,22 +3296,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3321,7 +3321,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3332,147 +3332,138 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)"
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ "
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ëºï½ü¤Ç¥¨¥é¡¼"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥¨¥ó¥È¥ê¤òºï½ü¤·¤Þ¤¹\n"
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "name ¥¤¥ó¥Ç¥Ã¥¯¥¹ºï½ü¤·¤Þ¤¹\n"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n"
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n"
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "rootdir %s Ãæ¤Ç¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹\n"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "°ì»þŪ¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤ÎºîÀ®¥¨¥é¡¼: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n"
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n"
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥­¥Ã¥×¤·¤Þ¤¹"
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ­¤Þ¤»¤ó"
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Þ¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Þ¤¹\n"
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤­´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n"
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ð¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤­´¹¤¨¤Þ¤¹"
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n"
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n"

diff --git a/po/ko.po b/po/ko.po
index 35f0750..282bbe2 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2457,7 +2457,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2528,107 +2528,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3100,22 +3100,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3125,7 +3125,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3136,145 +3136,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/no.po b/po/no.po
index 9f80af6..c591960 100644 (file)
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: 2000-06-22 21:59+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -2482,7 +2482,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2553,107 +2553,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3125,22 +3125,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3150,7 +3150,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3161,145 +3161,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/pl.po b/po/pl.po
index b609771..5a9bec8 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.2\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -2602,7 +2602,7 @@ msgstr "plik %s jest na nieznanym urz
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE licznik musi byæ 1.\n"
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Typ danych %d nie jest obs³ugiwany\n"
@@ -2673,107 +2673,107 @@ msgstr "spodziewany | na ko
 msgid "(unknown type)"
 msgstr "(nieznany typ)"
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr "   plik: %s akcja: %s\n"
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr "u¿ytkownik %s nie istnieje - u¿yto konta root"
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr "grupa %s nie istnieje - u¿yto grupy root"
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr "warto¶æ %%instchangelog w pliku makra powinna byæ liczb±, a nie jest"
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "rozpakowanie archiwum nie powiod³o siê %s%s: %s"
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr " na pliku "
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr "instacja pakietu ¼ród³owego\n"
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "nie mo¿na utworzyæ %s"
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr "nie mo¿na zapisaæ do %s"
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr "¼ród³a w: %s\n"
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "nie mo¿na utworzyæ %s"
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "plik spec w: %s\n"
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr "pakiet ¼ród³owy nie zawiera pliku .spec"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "zmiana nazwy %s na %s\n"
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "zmiana nazwy z %s na %s nie powiod³a sie: %s"
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr "spodziewany pakiet ¼ród³owy a nie binarny"
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "pakiet: %s-%s-%s test plików = %d\n"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr "przebieg testowy - instalacja zatrzymana\n"
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr "uruchamianie skryptu preinstall (je¶li istnieje)\n"
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "ostrze¿enie: %s utworzony jako %s"
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "ostrze¿enie: %s zapisany jako %s"
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 #, fuzzy
 msgid "running postinstall scripts (if any)\n"
 msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n"
@@ -3268,22 +3268,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "nie mo¿na otworzyæ %s\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3293,7 +3293,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3304,35 +3304,26 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "b³±d pobierania rekordu %s z %s"
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "b³±d zapisywania rekordu %s do %s"
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "b³±d usuwania rekordu %s z %s"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "¶cie¿ka bazy danych nie zosta³a podana"
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -3341,111 +3332,111 @@ msgstr ""
 "nowym formacie"
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "b³±d szukania pakietu %s\n"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "nie mo¿na odczytaæ nag³ówka przy %d dla poszukiwania"
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "usuwanie wpisu w bazie\n"
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "usuwanie indeksu grupy\n"
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "usuwanie indeksu nazw\n"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "b³±d szukania pakietu %s\n"
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "zmiana nazwy %s na %s\n"
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "odbudowywujê bazê danych w rootdir %s\n"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "tymczasowa baza danych %s ju¿ istnieje"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "b³±d przy tworzeniu katalogu %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otwieranie starej bazy danych\n"
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otwieranie nowej bazy danych\n"
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "rekord numer %d w bazie danych jest b³êdny -- rekord pominiêto"
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "nie mo¿na dodaæ rekordu oryginalnie przy %d"
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "przebudowanie bazy nie powiod³o siê; stara pozosta³a na miejscu\n"
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr "zamiana starej bazy na now± nie powiod³a siê!\n"
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "naprawcze zastêpowanie plików w %s plikami z %s"
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n"

diff --git a/po/pt.po b/po/pt.po
index 35f0750..282bbe2 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2457,7 +2457,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2528,107 +2528,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3100,22 +3100,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3125,7 +3125,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3136,145 +3136,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 95d9eae..e9452fe 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,7 +2,7 @@
 # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
 #
 msgid ""
-msgstr "POT-Creation-Date: 2000-07-15 10:39-0400\n"
+msgstr "POT-Creation-Date: 2000-07-15 11:53-0400\n"
 
 #: build.c:25 lib/rpminstall.c:451
 #, c-format
@@ -2723,7 +2723,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2796,112 +2796,112 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "instale pacote"
 
 # , c-format
-#: lib/install.c:622
+#: lib/install.c:636
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
 # , c-format
-#: lib/install.c:652
+#: lib/install.c:666
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "não foi passado pacote para instalação"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3409,22 +3409,22 @@ msgid ""
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3434,7 +3434,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3445,140 +3445,131 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
 # , c-format
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "não foi passado pacote para instalação"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
@@ -3591,13 +3582,13 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "RPM versão %s\n"
 
 # , c-format
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Não consegui abrir: %s\n"

diff --git a/po/ro.po b/po/ro.po
index f9c943e..459c1ed 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -2452,7 +2452,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2523,107 +2523,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3095,22 +3095,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3120,7 +3120,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3131,145 +3131,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/rpm.pot b/po/rpm.pot
index 35f0750..282bbe2 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2457,7 +2457,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2528,107 +2528,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3100,22 +3100,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3125,7 +3125,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3136,145 +3136,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/ru.po b/po/ru.po
index c2289bc..435d64d 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2606,7 +2606,7 @@ msgstr "
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE count must be 1.\n"
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "ôÉÐ ÄÁÎÎÙÈ %d ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
@@ -2677,107 +2677,107 @@ msgstr "
 msgid "(unknown type)"
 msgstr "(ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ)"
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr "ÆÁÊÌ : %s ÄÅÊÓÔ×ÉÅ: %s\n"
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr "ÐÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ, ÉÓÐÏÌØÚÕÀ root"
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr "ÇÒÕÐÐÁ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ, ÉÓÐÏÌØÚÕÀ root"
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr "ÚÎÁÞÅÎÉÅ %%instchangelog × ÍÁËÒÏÆÁÊÌÅ ÄÏÌÖÎÏ ÂÙÔØ ÞÉÓÌÏÍ, Á ÏÎÏ ÎÅÔ..."
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "ÒÁÓÐÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s"
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr " ÎÁ ÆÁÊÌÅ "
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÉÓÈÏÄÎÙÊ ÐÁËÅÔ\n"
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s"
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr "ÎÅ ÍÏÇÕ ÐÉÓÁÔØ × %s"
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr "ÉÓÈÏÄÎÉËÉ ×: %s\n"
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s"
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "ÆÁÊÌ spec ×: %s\n"
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr "ÉÓÈÏÄÎÙÊ ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ .spec"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "ÐÅÒÅÉÍÅÎÏ×Ù×ÁÀ %s × %s\n"
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "ÏÛÉÂËÁ ÐÅÒÅÉÍÅÎÏ×ÁÎÉÑ %s × %s: %s"
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr "ÏÖÉÄÁÌÓÑ ÉÓÈÏÄÎÙÊ ÐÁËÅÔ, ÎÁÊÄÅÎ ÂÉÎÁÒÎÙÊ"
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "ÐÁËÅÔ: %s-%s-%s ÆÁÊÌÏ×; test = %d\n"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr "ÏÓÔÁÎÁ×ÌÉ×ÁÀ ÕÓÔÁÎÏ×ËÕ, Ô.Ë. ÍÙ ÉÓÐÏÌÎÑÅÍ --test\n"
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr "ÉÓÐÏÌÎÑÀ ÓËÒÉÐÔ preinstall (ÅÓÌÉ ÅÓÔØ)\n"
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: %s ÓÏÚÄÁÎ ËÁË %s"
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: %s ÓÏÈÒÁÎÅÎ ËÁË %s"
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 #, fuzzy
 msgid "running postinstall scripts (if any)\n"
 msgstr "ÉÓÐÏÌÎÑÀ ÓËÒÉÐÔ postinstall (ÅÓÌÉ ÅÓÔØ)\n"
@@ -3268,22 +3268,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3293,7 +3293,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3304,35 +3304,26 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "ÏÛÉÂËÁ ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s"
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "ÏÛÉÂËÁ ÓÏÈÒÁÎÅÎÉÑ ÚÁÐÉÓÉ %s × %s"
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "ÎÅ ÕÓÔÁÎÏ×ÌÅÎÁ dbpath"
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -3341,111 +3332,111 @@ msgstr ""
 "ÂÁÚÙ ÎÏ×ÏÇÏ ÆÏÒÍÁÔÁ"
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "ÏÛÉÂËÁ ÐÒÉ ÐÏÉÓËÅ ÐÁËÅÔÁ %s\n"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "ÎÅ ÍÏÇÕ ÐÒÏÞÅÓÔØ ÈÅÄÅÒ × %d ÄÌÑ ÐÏÉÓËÁ"
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "ÕÄÁÌÑÀ ÚÁÐÉÓØ ÂÁÚÙ ÄÁÎÎÙÈ\n"
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÇÒÕÐÐ\n"
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÉÍÅÎ\n"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "ÏÛÉÂËÁ ÐÒÉ ÐÏÉÓËÅ ÐÁËÅÔÁ %s\n"
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "ÐÅÒÅÉÍÅÎÏ×Ù×ÁÀ %s × %s\n"
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "ÐÅÒÅÓÔÒÁÉ×ÁÀ ÂÁÚÕ × ËÏÒÎÅ×ÏÍ ËÁÔÁÌÏÇÅ %s\n"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "×ÒÅÍÅÎÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "ÓÏÚÄÁÀ ËÁÔÁÌÏÇ: %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ËÁÔÁÌÏÇÁ %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "ÏÔËÒÙ×ÁÀ ÓÔÁÒÕÀ ÂÁÚÕ\n"
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "ÏÔËÒÙ×ÁÀ ÎÏ×ÕÀ ÂÁÚÕ\n"
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "ÚÁÐÉÓØ ÎÏÍÅÒ %d × ÂÁÚÅ ÎÅ×ÅÒÎÁ, ÐÒÏÐÕÓËÁÀ"
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "ÎÅ ÍÏÇÕ ÄÏÂÁ×ÉÔØ ÚÁÐÉÓØ (ÐÅÒ×ÏÎÁÞÁÌØÎÏ × %d)"
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "ÐÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n"
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr "ÚÁÍÅÎÁ ÓÔÁÒÏÊ ÂÁÚÙ ÎÁ ÎÏ×ÕÀ ÎÅ ÕÄÁÌÁÓØ!\n"
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÚÁÍÅÎÑÅÔ ÆÁÊÌÙ × %s ÆÁÊÌÁÍÉ ÉÚ %s"
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "ÓÏÚÄÁÀ ËÁÔÁÌÏÇ: %s\n"
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "ÕÄÁÌÅÎÉÅ ËÁÔÁÌÏÇÁ %s ÎÅ ÕÄÁÌÏÓØ: %s\n"

diff --git a/po/sk.po b/po/sk.po
index 692cdd9..a77ce5f 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.93\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -2609,7 +2609,7 @@ msgstr "s
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE poèet musí by» 1.\n"
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Typ údajov %d nie je podorovaný\n"
@@ -2680,107 +2680,107 @@ msgstr "| o
 msgid "(unknown type)"
 msgstr "(neznámy typ)"
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr "   súbor: akcia %s: %s\n"
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr "pou¾ívateµ %s neexistuje - pou¾ije sa root"
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr "skupina %s neexistuje - pou¾ije sa root"
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr "hodnota %%instchangelog v makro-súbore by mala by» èíselná, ale nie je"
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "rozbalenie archívu zlyhalo%s%s: %s"
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr " pre súbor "
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr "in¹taluje sa zdrojový balík\n"
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "nie je mo¾né zapísa» do %s: "
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr "nie je mo¾né zapísa» do %s: "
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr "zdroje v: %s\n"
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "nie je mo¾né zapísa» do %s: "
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "spec-súbor v: %s\n"
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "premenováva sa %s na %s\n"
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "premenovanie %s na %s zlyhalo: %s"
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr "oèakávaný zdrojový balík, nájdený binárny"
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "balík: %s-%s-%s test súborov = %d\n"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr "in¹talácia zastavená kvôli re¾imu --test\n"
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr "vykonávajú sa predin¹talaèné skripty (ak existujú)\n"
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "varovanie: %s vytvorené ako %s"
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "varovanie: %s uchovaný ako %s"
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 #, fuzzy
 msgid "running postinstall scripts (if any)\n"
 msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n"
@@ -3274,22 +3274,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "nie je mo¾né otvori» %s\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3299,7 +3299,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3310,35 +3310,26 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "chyba pri naèítaní záznamu %s z %s"
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "chyba pri zápise záznamu %s do %s"
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "chyba pri odstraòovaní záznamu %s z %s"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "nebola nastavená ¾iadna dbpath"
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -3347,111 +3338,111 @@ msgstr ""
 "databázy v novom formáte"
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "chyba pri hµadaní balíka %s\n"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "nie je mo¾né preèíta» hlavièku na %d pre vyhµadanie"
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "odstraòuje sa záznam z databázy\n"
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstraòuje sa index skupín\n"
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "odstraòuje sa index názvov\n"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "chyba pri hµadaní balíka %s\n"
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "premenováva sa %s na %s\n"
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "znovu sa vytvára databáza v adresári %s\n"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "doèasná databáza %s u¾ existuje"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "chyba pri vytváraní adresára %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otvára sa stará databáza\n"
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otvára sa nová databáza\n"
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "záznam èíslo %d v databáze je chybný -- bol vynechaný"
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "nie je mo¾né prida» záznam pôvodne na %d"
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "nepodarilo sa znovu vytvori» databázu; zostáva pôvodná\n"
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr "nepodarilo sa nahradi» starú databázu novou!\n"
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "nahradí súbory v %s súbormi z %s kvôli obnove"
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "nepodarilo sa odstráni» adresár %s: %s\n"

diff --git a/po/sl.po b/po/sl.po
index 60f7f36..1b6fd89 100644 (file)
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,12 +1,12 @@
 # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.79 2000/07/15 14:53:58 jbj Exp $
+# $Id: sl.po,v 1.80 2000/07/15 16:00:16 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: 2000-02-17 22:25+01:00\n"
 "Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -2598,7 +2598,7 @@ msgstr "datoteka %s se nahaja na neznani napravi"
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "¹tevec grabData() RPM_STRING_TYPE mora biti 1.\n"
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Tip podatkov %d ni podprt\n"
@@ -2669,107 +2669,107 @@ msgstr "| pri
 msgid "(unknown type)"
 msgstr "(neznan tip)"
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr " datoteka: %s akcija: %s\n"
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr "uporabnik %s ne obstaja - uporabljamo root"
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr "skupina %s ne obstaja - uporabljamo root"
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr "vrednost %%instchangelog v makrodatoteki bi morala biti ¹tevilo, pa ni"
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "razpakiranje arhiva neuspe¹no%s%s: %s"
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr " pri datoteki "
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr "name¹èanje izvornega paketa\n"
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr "ni mo¾no ustvariti izvornega imenika %s"
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr "ni mo¾no pisanje na %s"
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr "izvori v: %s\n"
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr "ni mo¾no ustvariti imenika z doloèili spec %s"
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "datoteka spec v: %s\n"
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr "izvorni paket ne vsebuje datoteke .spec"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "preimenujemo %s v %s\n"
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "preimenovanje %s v %s neuspe¹no: %s"
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr "prièakovan izvorni paket, najden binarni"
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "paket: %s-%s-%s datoteke test = %d\n"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr "ustavljamo namestitev ker teèemo kot --test\n"
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr "poganjamo prednamestitvene skripte (èe obstajajo)\n"
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "opozorilo: %s ustvarjen kot %s"
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "opozorilo: %s shranjen kot %s"
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr "poganjamo ponamestitvene skripte (èe obstajajo)\n"
 
@@ -3259,22 +3259,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "ni mo¾no odpreti %s: %s\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3284,7 +3284,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3295,147 +3295,138 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "napaka pri branju zapisa %s iz %s"
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "napaka pri pisanju zapisa %s v %s"
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "napaka pri brisanju zapisa %s iz %s"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "dbpath ni nastavljena"
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr "staro obliko podatkove zbirke pretvorite v novo z --rebuilddb"
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "napaka pri iskanju paketa %s\n"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "ni mo¾no prebrati glave pri %d za vpogled"
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "odstranjujemo vnose v podatkovni zbirki\n"
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstranjujemo seznam skupin\n"
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "odstranjujemo seznam imen\n"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "napaka pri iskanju paketa %s\n"
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "preimenujemo %s v %s\n"
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "zaèasna podatkovna zbirka %s ¾e obstaja"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "ustvarjamo imenik: %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "napaka pri ustvarjanju imenika %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "odpiramo staro podatkovno zbirko\n"
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "odpiramo novo podatkovno zbirko\n"
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "zapis ¹t. %d v zbirki je okvarjen -- preskakujemo."
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "zapisa ni mo¾no dodati na %d"
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "ponovna izgradnja podatkovne zbirke neuspe¹na; stara ostaja na istem mestu\n"
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr "zamenjava stare podatkovne zbirke z novo neuspe¹na!\n"
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "posku¹amo povrniti z nadomestitvijo datotek v %s z datotekami iz %s"
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "ustvarjamo imenik: %s\n"
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspe¹na odstranitev imenika %s: %s\n"

diff --git a/po/sr.po b/po/sr.po
index 6910c15..2503695 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
@@ -2616,7 +2616,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2689,109 +2689,109 @@ msgstr "| o
 msgid "(unknown type)"
 msgstr "(nepoznat tip)"
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, fuzzy, c-format
 msgid "   file: %s action: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "instaliraj paket"
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, fuzzy, c-format
 msgid "spec file in: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "preimenovanje %s u %s nije uspelo: %s"
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3297,22 +3297,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "gre¹ka: ne mogu da otvorim %s\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3322,7 +3322,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3333,145 +3333,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "gre¹ka kod uzimanja sloga %s iz %s"
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "gre¹ka zapisivanja sloga %s u %s"
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "dbpath nije odreðen"
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "gre¹ka kod potrage za paketom %s\n"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "ne mogu da proèitam zaglavlje na %d za proveru"
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "gre¹ka kod potrage za paketom %s\n"
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "privremena baza podataka %s veæ postoji"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "slog broj %d u bazi podataka je neispravan -- preskaèem ga"
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "ne mogu da dodam slog originalno na %d"
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"

diff --git a/po/sv.po b/po/sv.po
index 12f61f7..110d00e 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: 2000-06-22 23:35+0200\n"
 "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -2516,7 +2516,7 @@ msgstr "filen %s 
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE måste vara 1.\n"
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datatyp %d stöds inte\n"
@@ -2587,107 +2587,107 @@ msgstr "| f
 msgid "(unknown type)"
 msgstr "(okänd typ)"
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr "   fil: %s åtgärd: %s\n"
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr "användare %s finns inte - använder root"
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr "grupp %s finns inte - använder root"
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr "%%instchangelog-värde i makrofil skall vara ett tal, men är inte det"
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "uppackning av arkiv misslyckades%s%s: %s"
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr " vid fil "
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr "installerar källpaket\n"
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr "kan inte skapa källkatalog %s"
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr "kan inte skriva till %s"
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr "källkod i: %s\n"
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr "kan inte skapa spec-katalog %s"
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "spec-fil i: %s\n"
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr "källpaket innehåller ingen spec-fil"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "byter namn på %s till %s\n"
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "namnbyte från %s till %s misslyckades: %s"
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr "källpaket förväntades, fann binärpaket"
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "paket: %s-%s-%s filtest = %d\n"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr "avbryter installation eftersom vi kör --test\n"
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr "kör (eventuellt) preinstalltionsskript\n"
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "varning: %s skapades som %s"
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "varning: %s sparades som %s"
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr "kör (eventuellt) postinstallationsskript\n"
 
@@ -3170,16 +3170,16 @@ msgstr ""
 "/etc/rpm/macros).\n"
 "\n"
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "dbiOpen: kan inte öppna %s-index"
 
-#: lib/rpmdb.c:303
-#, c-format
+#: lib/rpmdb.c:301
+#, fuzzy, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
@@ -3190,7 +3190,7 @@ msgstr ""
 "    databas till db%d-format genom att köra \"rpm --rebuilddb\" som root.\n"
 "\n"
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3206,7 +3206,7 @@ msgstr ""
 "/etc/rpm/macros).\n"
 "\n"
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3225,40 +3225,26 @@ msgstr ""
 "/etc/rpm/macros).\n"
 "\n"
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-"\n"
-"--> En rpmdatabas i db1-format existerar i %s.\n"
-"    Konvertera till db%d-format genom att köra \"rpm --rebuilddb\" som "
-"root.\n"
-"\n"
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "fel(%d) när \"%s\"-poster hämtades från %s-index"
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "fel(%d) när post %s sparades i %s"
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "fel(%d) när post %s togs bort ur %s"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "ingen dbpath har satts"
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -3267,110 +3253,110 @@ msgstr ""
 "i nytt format"
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr "fel(%d) när paket räknades"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "%s: kan inte läsa huvud vid 0x%x"
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "tar bort 0 %s-poster.\n"
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "tar bort \"%s\" från %s-index.\n"
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "tar bort %d poster från %s-index:\n"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "fel(%d) vid allokering av ny paketinstans"
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr "lägger till 0 %s-poster.\n"
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "lägger till \"%s\" till %s-index.\n"
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr "lägger till %d poster till %s-index:\n"
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "bygger om databas %s till %s\n"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "tillfällig databas %s existerar redan"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr "skapar katalog %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "fel när katalog skapades %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "öppnar gammal databas med dbapi %d\n"
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "öppnar ny databas med dbapi %d\n"
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "post nummer %d i databasen är felaktig -- hoppar över den."
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "kan inte lägga till post ursprungligen vid %d"
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n"
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr "kunde inte ersätta gammal databas med ny databas!\n"
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "byt ut filer i %s med filer från %s för att återställa"
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr "tar bort katalog %s\n"
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunde inte ta bort katalogen %s: %s\n"
@@ -3987,6 +3973,18 @@ msgstr "url-port m
 msgid "failed to create %s: %s\n"
 msgstr "kunde inte skapa %s: %s\n"
 
+#~ msgid ""
+#~ "\n"
+#~ "--> An rpm database in db1 format exists in %s.\n"
+#~ "    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "--> En rpmdatabas i db1-format existerar i %s.\n"
+#~ "    Konvertera till db%d-format genom att köra \"rpm --rebuilddb\" som "
+#~ "root.\n"
+#~ "\n"
+
 #, fuzzy
 #~ msgid "line %d: Invalid tag value: %s"
 #~ msgstr "rad %d: Felaktig tagg: %s"

diff --git a/po/tr.po b/po/tr.po
index ec7a833..f9c912f 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2658,7 +2658,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2731,109 +2731,109 @@ msgstr "dizinin sonunda | bekleniyordu"
 msgid "(unknown type)"
 msgstr "(bilinmeyen tip)"
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, fuzzy, c-format
 msgid "   file: %s action: %s\n"
 msgstr "%s açýlamadý: %s"
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "paket yüklemek"
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "%s dosyasý açýlamýyor: "
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "%s dosyasý açýlamýyor: "
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "%s dosyasý açýlamýyor: "
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, fuzzy, c-format
 msgid "spec file in: %s\n"
 msgstr "%s açýlamadý: %s"
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "%s 'nin isminin  %s 'ye çevrilmesinde belirtilen hata oluþtu: %s"
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "Paket %s-%s-%s ortak (shared) dosyalar içeriyor\n"
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3343,22 +3343,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "hata: %s eriþilemiyor\n"
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3368,7 +3368,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3379,145 +3379,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr "%s kaydýna %s dosyasýnda eriþilemiyor:"
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr "%s kaydý %s dosyasýna yazýlamýyor"
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr "dbpath deðeri girilmemiþ"
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "%s pakedi aranýrken hata oluþtu\n"
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "%d kaydýndan baþlýk bilgisi okunamadý"
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, fuzzy, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "%s pakedi aranýrken hata oluþtu\n"
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "geçici veritabaný %s mevcut"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "%s dizinin oluþturulmasýnda hata: %s"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "%s dizinin oluþturulmasýnda hata: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "veritabanýndaki %d numaralý kayýt hatalý -- atlanýyor"
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "%d de yer alan kayýt saklayamýyor"
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "%s dizinin oluþturulmasýnda hata: %s"
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "%s açýlamadý: %s"

diff --git a/po/uk.po b/po/uk.po
index 35f0750..282bbe2 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-15 10:39-0400\n"
+"POT-Creation-Date: 2000-07-15 11:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2457,7 +2457,7 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:721 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:324
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2528,107 +2528,107 @@ msgstr ""
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:148 lib/uninstall.c:195
+#: lib/install.c:149 lib/uninstall.c:195
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: lib/install.c:167
+#: lib/install.c:168
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:175
+#: lib/install.c:176
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:204
+#: lib/install.c:205
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: lib/install.c:557
+#: lib/install.c:571
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:558
+#: lib/install.c:572
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:602
+#: lib/install.c:616
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:622
+#: lib/install.c:636
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:628 lib/install.c:658
+#: lib/install.c:642 lib/install.c:672
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:632
+#: lib/install.c:646
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:652
+#: lib/install.c:666
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:662
+#: lib/install.c:676
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:696 lib/install.c:724
+#: lib/install.c:710 lib/install.c:738
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:746
+#: lib/install.c:760
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:748 lib/install.c:1021 lib/uninstall.c:28
+#: lib/install.c:762 lib/install.c:1035 lib/uninstall.c:28
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:840
+#: lib/install.c:854
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:890
+#: lib/install.c:904
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:950
+#: lib/install.c:964
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:955
+#: lib/install.c:969
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:980
+#: lib/install.c:994
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1017
+#: lib/install.c:1031
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1105
+#: lib/install.c:1119
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -3100,22 +3100,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:292
+#: lib/rpmdb.c:290
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:303
+#: lib/rpmdb.c:301
 #, c-format
 msgid ""
 "\n"
-"--> The rpm database is in db%d format, not the suggested db%d format.\n"
+"--> The rpm database cannot be opened in db%d format.\n"
 "    If you have just upgraded the rpm package you need to convert\n"
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:317
+#: lib/rpmdb.c:314
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the rpm database is db%d format.\n"
@@ -3125,7 +3125,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:332
+#: lib/rpmdb.c:329
 msgid ""
 "\n"
 "--> The rpm database is in db%d format, not the suggested db%d format.\n"
@@ -3136,145 +3136,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:351
-#, c-format
-msgid ""
-"\n"
-"--> An rpm database in db1 format exists in %s.\n"
-"    Please convert to db%d format by running \"rpm --rebuilddb\" as root.\n"
-"\n"
-msgstr ""
-
-#: lib/rpmdb.c:423
+#: lib/rpmdb.c:397
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:541
+#: lib/rpmdb.c:515
 #, c-format
 msgid "error(%d) storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:550
+#: lib/rpmdb.c:524
 #, c-format
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:785 lib/rpmdb.c:2305
+#: lib/rpmdb.c:759 lib/rpmdb.c:2279
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:884
+#: lib/rpmdb.c:858
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1096
+#: lib/rpmdb.c:1070
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1155 lib/rpmdb.c:1674 lib/uninstall.c:97
+#: lib/rpmdb.c:1129 lib/rpmdb.c:1648 lib/uninstall.c:97
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1727
+#: lib/rpmdb.c:1701
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1738
+#: lib/rpmdb.c:1712
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1747
+#: lib/rpmdb.c:1721
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1889
+#: lib/rpmdb.c:1863
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1946
+#: lib/rpmdb.c:1920
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1962
+#: lib/rpmdb.c:1936
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1971
+#: lib/rpmdb.c:1945
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2304
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2308
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2314
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2316
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2323
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2358
+#: lib/rpmdb.c:2332
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2381
+#: lib/rpmdb.c:2355
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2413
+#: lib/rpmdb.c:2387
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2431
+#: lib/rpmdb.c:2405
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2439
+#: lib/rpmdb.c:2413
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2415
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2425
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2427
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/rpm.spec b/rpm.spec
index 30ce293..8a9ff44 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -264,6 +264,8 @@ fi
 - remove (dead) rpmdb API code in python bindings.
 - remove (legacy) support for version 1 packaging.
 - remove (legacy) support for converting gdbm databases.
+- fix: make set of replaced file headers unique.
+- fix: don't attempt dbiOpen with anything but requested dbN.
 
 * Thu Jul 13 2000 Jeff Johnson <jbj@redhat.com>
 - fix: initialize pretransaction argv (segfault).