- check header blobs on export (i.e. rpmdbAdd())..

- enable iterator header blob checks for install/erase modes.
- python: _vsflags_up2date macro to configure verify signature flags.

CVS patchset: 5595
CVS date: 2002/08/02 21:52:01

diff --git a/CHANGES b/CHANGES
index 79f3f9e..2543ca8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -206,6 +206,9 @@
        - fix: repair --root with --verify (#70527).
        - fix: signed pubkeys were imported incorrectly (#68291).
        - include tgpg script to verify signatures using only gpg.
+       - check header blobs on export (i.e. rpmdbAdd()).
+       - enable iterator header blob checks for install/erase modes.
+       - python: _vsflags_up2date macro to configure verify signature flags.
 
 4.0.3 -> 4.0.4:
        - solaris: translate i86pc to i386 (#57182).

diff --git a/lib/psm.c b/lib/psm.c
index 37910bb..473817b 100644 (file)
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -1850,20 +1850,24 @@ assert(psm->mi == NULL);
        fi->h = rpmdbNextIterator(psm->mi);
        if (fi->h)
            fi->h = headerLink(fi->h);
-else {
-fprintf(stderr, "*** PSM_RDB_LOAD: header #%u not found\n", fi->record);
-}
+
        psm->mi = rpmdbFreeIterator(psm->mi);
        rc = (fi->h ? RPMRC_OK : RPMRC_FAIL);
        break;
     case PSM_RPMDB_ADD:
        if (rpmtsFlags(ts) & RPMTRANS_FLAG_TEST)        break;
-       if (fi->h != NULL)      /* XXX can't happen */
-       rc = rpmdbAdd(rpmtsGetRdb(ts), rpmtsGetTid(ts), fi->h, NULL, NULL);
+       if (fi->h == NULL)      break;  /* XXX can't happen */
+       if (!(rpmtsVerifySigFlags(ts) & _RPMTS_VSF_NOHDRCHK))
+           rc = rpmdbAdd(rpmtsGetRdb(ts), rpmtsGetTid(ts), fi->h,
+                               ts, headerCheck);
+       else
+           rc = rpmdbAdd(rpmtsGetRdb(ts), rpmtsGetTid(ts), fi->h,
+                               NULL, NULL);
        break;
     case PSM_RPMDB_REMOVE:
        if (rpmtsFlags(ts) & RPMTRANS_FLAG_TEST)        break;
-       rc = rpmdbRemove(rpmtsGetRdb(ts), rpmtsGetTid(ts), fi->record, NULL, NULL);
+       rc = rpmdbRemove(rpmtsGetRdb(ts), rpmtsGetTid(ts), fi->record,
+                               NULL, NULL);
        break;
 
     default:

diff --git a/lib/query.c b/lib/query.c
index ad823e1..9b4172d 100644 (file)
--- a/lib/query.c
+++ b/lib/query.c
@@ -926,7 +926,7 @@ int rpmcliQuery(rpmts ts, QVA_t qva, const char ** argv)
     if (qva->qva_showPackage == NULL)
        qva->qva_showPackage = showQueryPackage;
 
-    vsflags = rpmExpandNumeric("%{_vsflags_query}");
+    vsflags = rpmExpandNumeric("%{?_vsflags_query}");
     if (qva->qva_flags & VERIFY_DIGEST)
        vsflags |= _RPMTS_VSF_NODIGESTS;
     if (qva->qva_flags & VERIFY_SIGNATURE)

diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index d1e2672..5c6a896 100644 (file)
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -244,9 +244,9 @@ int rpmInstall(rpmts ts,
     ts->goal = TSM_INSTALL;
 
     if (ia->installInterfaceFlags & INSTALL_UPGRADE)
-       vsflags = rpmExpandNumeric("%{_vsflags_erase}");
+       vsflags = rpmExpandNumeric("%{?_vsflags_erase}");
     else
-       vsflags = rpmExpandNumeric("%{_vsflags_install}");
+       vsflags = rpmExpandNumeric("%{?_vsflags_install}");
     if (ia->qva_flags & VERIFY_DIGEST)
        vsflags |= _RPMTS_VSF_NODIGESTS;
     if (ia->qva_flags & VERIFY_SIGNATURE)
@@ -648,7 +648,7 @@ int rpmErase(rpmts ts,
 
     if (argv == NULL) return 0;
 
-    vsflags = rpmExpandNumeric("%{_vsflags_erase}");
+    vsflags = rpmExpandNumeric("%{?_vsflags_erase}");
     if (ia->qva_flags & VERIFY_DIGEST)
        vsflags |= _RPMTS_VSF_NODIGESTS;
     if (ia->qva_flags & VERIFY_SIGNATURE)

diff --git a/lib/transaction.c b/lib/transaction.c
index d765dfc..c38aaa9 100644 (file)
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -1399,7 +1399,7 @@ rpmMessage(RPMMESS_DEBUG, _("install/erase %d elements\n"), rpmtsNElements(ts));
                    rpmRC rpmrc;
 
                    rpmrc = rpmReadPackageFile(ts, rpmteFd(p),
-                               "rpmtsRun", &p->h);
+                               rpmteNEVR(p), &p->h);
 
                    if (!(rpmrc == RPMRC_OK || rpmrc == RPMRC_BADSIZE)) {
                        /*@-noeffectuncon@*/ /* FIX: notify annotations */

diff --git a/lib/verify.c b/lib/verify.c
index ad109ac..d9689ae 100644 (file)
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -471,7 +471,7 @@ int rpmcliVerify(rpmts ts, QVA_t qva, const char ** argv)
         qva->qva_showPackage = showVerifyPackage;
 
     /* XXX verify flags are inverted from query. */
-    vsflags = rpmExpandNumeric("%{_vsflags_verify}");
+    vsflags = rpmExpandNumeric("%{?_vsflags_verify}");
     if (!(qva->qva_flags & VERIFY_DIGEST))
        vsflags |= _RPMTS_VSF_NODIGESTS;
     if (!(qva->qva_flags & VERIFY_SIGNATURE))

diff --git a/macros.in b/macros.in
index 84c1392..d76bd17 100644 (file)
--- a/macros.in
+++ b/macros.in
@@ -1,7 +1,7 @@
 #/*! \page config_macros Default configuration: /usr/lib/rpm/macros
 # \verbatim
 #
-# $Id: macros.in,v 1.116 2002/07/31 19:41:33 jbj Exp $
+# $Id: macros.in,v 1.117 2002/08/02 21:52:01 jbj Exp $
 #
 # This is a global RPM configuration file. All changes made here will
 # be lost when the rpm package is upgraded. Any per-system configuration
@@ -570,11 +570,12 @@
 #      Note: the %_vsflags_erase applies to --upgrade/--freshen modes as
 #      well as --erase.
 #
-%_vsflags_build                8
-%_vsflags_erase                8
-%_vsflags_install      8
+%_vsflags_build                0
+%_vsflags_erase                0
+%_vsflags_install      0
 %_vsflags_query                8
 %_vsflags_rebuilddb    0
+%_vsflags_up2date      0
 %_vsflags_verify       0
 
 #      Relations between package names that cause dependency loops

diff --git a/po/cs.po b/po/cs.po
index cbf95c6..9c14e2c 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-0400\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -3203,160 +3203,149 @@ msgstr "nemohu otev
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1686
-#, fuzzy, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr "chyba pøi vytváøení doèasného souboru %s\n"
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, fuzzy, c-format
-msgid "h#%7u: %s"
-msgstr "%s: %s\n"
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
-msgstr ""
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "chyba pøi vytváøení doèasného souboru %s\n"
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "chyba pøi vytváøení doèasného souboru %s\n"
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n"
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n"
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "chyba pøi vytváøení doèasného souboru %s\n"
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "chyba pøi vytváøení doèasného souboru %s\n"
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "chyba pøi vytváøení doèasného souboru %s\n"
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "znovu vytvoøit databázi z existující databáze"
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "chyba pøi vytváøení doèasného souboru %s\n"
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "nemohu provést dotaz %s: %s\n"
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Nelze pøejmenovat %s na %s: %m\n"
@@ -3637,6 +3626,10 @@ msgstr "%s: otev
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Fread selhalo: %s\n"
 
+#, fuzzy
+#~ msgid "h#%7u: %s"
+#~ msgstr "%s: %s\n"
+
 #~ msgid "unexpected arguments to --querytags "
 #~ msgstr "neoèekávané parametry pro --querytags "
 

diff --git a/po/da.po b/po/da.po
index 6fa0465..c523cf0 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-0400\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -3211,164 +3211,153 @@ msgstr "kan ikke 
 msgid "no dbpath has been set\n"
 msgstr "der er ikke sat nogen dbpath\n"
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n"
 
-#: rpmdb/rpmdb.c:1686
-#, fuzzy, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr "fejl(%d) ved gemning af post %s i %s\n"
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, fuzzy, c-format
-msgid "h#%7u: %s"
-msgstr "fil %s: %s\n"
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
-msgstr ""
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "fejl(%d) ved gemning af post %s i %s\n"
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: kan ikke læse hoved ved 0x%x\n"
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n"
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "fjerner \"%s\" fra %s-indekset.\n"
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "fjerne %d indgange fra %s-indekset.\n"
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n"
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "fejl(%d) ved gemning af post %s i %s\n"
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "fejl(%d) ved fjernelse af post %s fra %s\n"
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "fejl(%d) under allokering af ny pakkeinstans\n"
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 "tilføjer \"%s\" til '%s'-indekset.\n"
 "\n"
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "tilføjer %d indgange til '%s'-indekset.\n"
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "fejl(%d) ved gemning af post %s i %s\n"
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "fjerner %s efter vellykket genopbygning af db3.\n"
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr "der ikke sat nogen dbpath"
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "genopbygger database %s over i %s\n"
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "den midlertidige database %s eksisterer allerede\n"
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 "opretter kataloget %s\n"
 "\n"
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "opretter kataloget %s: %s\n"
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "åbner gammel database med dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "åbner ny database med dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "post nummer %d i databasen er fejlbehæftet -- overspringer.\n"
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "kunne ikke tilføje posten, der tidligere var ved %d\n"
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "kunne ikke genopbygge database: original-databasen beholdes\n"
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr "kunne ikke erstatte gammel database med ny database!\n"
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "erstat filer i %s med filer fra %s for at genoprette"
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, c-format
 msgid "removing directory %s\n"
 msgstr "fjerner kataloget %s\n"
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunne ikke fjerne katalog %s: %s\n"
@@ -3644,6 +3633,10 @@ msgstr "%s: 
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: læs manifest mislykkedes: %s\n"
 
+#, fuzzy
+#~ msgid "h#%7u: %s"
+#~ msgstr "fil %s: %s\n"
+
 #~ msgid "unexpected arguments to --querytags "
 #~ msgstr "uventede parametre til --querytags "
 

diff --git a/po/de.po b/po/de.po
index 4147a9c..e1b2199 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-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"
@@ -3397,167 +3397,155 @@ msgstr "Fehler: kann %s nicht 
 msgid "no dbpath has been set\n"
 msgstr "»dbpath« ist nicht gesetzt"
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "Fehler beim Eintrag %s von %s"
 
-#: rpmdb/rpmdb.c:1686
-#, fuzzy, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-# , c-format
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, fuzzy, c-format
-msgid "h#%7u: %s"
-msgstr "Öffnen von %s fehlgeschlagen: %s"
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
-msgstr ""
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen"
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "Fehler beim Eintrag %s von %s"
 
 # FIXME
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
 # FIXME
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "Fehler beim Eintrag %s von %s"
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
 
 # FIXME
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
 # FIXME
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr "»dbpath« ist nicht gesetzt"
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "die temporäre Datenbank %s existiert schon"
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 "Eintrag Nummer %d in der Datenback ist nicht in Ordnung -- wird übersprungen"
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d"
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
 # , c-format
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
@@ -3843,6 +3831,11 @@ msgstr "%s: 
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
+# , c-format
+#, fuzzy
+#~ msgid "h#%7u: %s"
+#~ msgstr "Öffnen von %s fehlgeschlagen: %s"
+
 #~ msgid "unexpected arguments to --querytags "
 #~ msgstr "Unerwartete Argumente zu --querytags "
 

diff --git a/po/en_RN.po b/po/en_RN.po
index ffa1fd6..3f58eca 100644 (file)
--- a/po/en_RN.po
+++ b/po/en_RN.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-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"
@@ -3111,160 +3111,149 @@ msgstr ""
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1686
-#, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, c-format
-msgid "h#%7u: %s"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/es.po b/po/es.po
index ffa1fd6..3f58eca 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-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"
@@ -3111,160 +3111,149 @@ msgstr ""
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1686
-#, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, c-format
-msgid "h#%7u: %s"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/eu_ES.po b/po/eu_ES.po
index ffa1fd6..3f58eca 100644 (file)
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-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"
@@ -3111,160 +3111,149 @@ msgstr ""
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1686
-#, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, c-format
-msgid "h#%7u: %s"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/fi.po b/po/fi.po
index 34cde46..036ff3e 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -3259,160 +3259,149 @@ msgstr "virhe: en voi avata %s\n"
 msgid "no dbpath has been set\n"
 msgstr "dbpath ei ole asetettu"
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "virhe luettaessa tietuetta %s %s:stä"
 
-#: rpmdb/rpmdb.c:1686
-#, fuzzy, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr "virhe talletettaessa tietuetta %s %s:ään"
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, fuzzy, c-format
-msgid "h#%7u: %s"
-msgstr "en voinut avata %s: %s"
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
-msgstr ""
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "virhe talletettaessa tietuetta %s %s:ään"
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "en voi lukea headeria %d:stä päivittäessä"
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "virhe luettaessa tietuetta %s %s:stä"
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "virhe luettaessa tietuetta %s %s:stä"
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "virhe talletettaessa tietuetta %s %s:ään"
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "virhe talletettaessa tietuetta %s %s:ään"
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr "dbpath ei ole asetettu"
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "väliaikainen tietokanta %s on jo olemassa"
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen"
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "en voi lisätä tietuetta %d:stä"
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "en voinut avata %s: %s"
@@ -3696,6 +3685,10 @@ msgstr "%s: avaus ei onnistunut\n"
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
+#, fuzzy
+#~ msgid "h#%7u: %s"
+#~ msgstr "en voinut avata %s: %s"
+
 #~ msgid "unexpected arguments to --querytags "
 #~ msgstr "--querytags: odottamattomia parametrejä"
 

diff --git a/po/fr.po b/po/fr.po
index 6e15874..05fbf02 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-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"
@@ -3294,160 +3294,149 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:1686
-#, fuzzy, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr "impossible d'ouvrir: %s\n"
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, fuzzy, c-format
-msgid "h#%7u: %s"
+msgid "error(%d) storing record #%d into %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -3722,6 +3711,10 @@ msgid "%s: read manifest failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #, fuzzy
+#~ msgid "h#%7u: %s"
+#~ msgstr "impossible d'ouvrir: %s\n"
+
+#, fuzzy
 #~ msgid "Use \"--macros <file:...>\" instead.\n"
 #~ msgstr "Utilisez de prfrence -e ou --erase.\n"
 

diff --git a/po/gl.po b/po/gl.po
index a31b9c1..f459a42 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-0400\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -3106,160 +3106,149 @@ msgstr ""
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1686
-#, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, c-format
-msgid "h#%7u: %s"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/hu.po b/po/hu.po
index ffa1fd6..3f58eca 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-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"
@@ -3111,160 +3111,149 @@ msgstr ""
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1686
-#, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, c-format
-msgid "h#%7u: %s"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/id.po b/po/id.po
index ffa1fd6..3f58eca 100644 (file)
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-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"
@@ -3111,160 +3111,149 @@ msgstr ""
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1686
-#, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, c-format
-msgid "h#%7u: %s"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/is.po b/po/is.po
index 9dfd5f0..f0addc9 100644 (file)
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-0400\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -3134,160 +3134,149 @@ msgstr "get ekki opna
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1686
-#, c-format
-msgid "error(%d) storing record #%d into %s\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2289
+#: rpmdb/rpmdb.c:1690
 #, c-format
-msgid "h#%7u: already checked.\n"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2298
-#, fuzzy, c-format
-msgid "h#%7u: %s"
-msgstr "%s: %s\n"
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
@@ -3560,6 +3549,10 @@ msgid "%s: read manifest failed: %s\n"
 msgstr "%s rmdir %s brást: %s\n"
 
 #, fuzzy
+#~ msgid "h#%7u: %s"
+#~ msgstr "%s: %s\n"
+
+#, fuzzy
 #~ msgid "don't verify package digest"
 #~ msgstr "ekki skoða pakkaskilyrðin"
 

diff --git a/po/it.po b/po/it.po
index ffa1fd6..3f58eca 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-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"
@@ -3111,160 +3111,149 @@ msgstr ""
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1686
-#, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, c-format
-msgid "h#%7u: %s"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/ja.po b/po/ja.po
index d038a5e..a24ce73 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-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"
@@ -3308,162 +3308,151 @@ msgstr "%s 
 msgid "no dbpath has been set\n"
 msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)"
 
-#: rpmdb/rpmdb.c:1686
-#, fuzzy, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ "
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, fuzzy, c-format
-msgid "h#%7u: %s"
-msgstr "¥Õ¥¡¥¤¥ë %s: %s\n"
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
-msgstr ""
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ "
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)"
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "name ¥¤¥ó¥Ç¥Ã¥¯¥¹ºï½ü¤·¤Þ¤¹\n"
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)"
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ "
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ëºï½ü¤Ç¥¨¥é¡¼"
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n"
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n"
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n"
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ "
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "rootdir %s Ãæ¤Ç¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹\n"
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "°ì»þŪ¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹"
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n"
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n"
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n"
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n"
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥­¥Ã¥×¤·¤Þ¤¹"
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ­¤Þ¤»¤ó"
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Þ¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Þ¤¹\n"
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤­´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n"
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ð¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤­´¹¤¨¤Þ¤¹"
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n"
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n"
@@ -3748,6 +3737,10 @@ msgstr "%s: fdOpen 
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
+#, fuzzy
+#~ msgid "h#%7u: %s"
+#~ msgstr "¥Õ¥¡¥¤¥ë %s: %s\n"
+
 #~ msgid "unexpected arguments to --querytags "
 #~ msgstr "--querytags ¤Î°ú¿ô¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
 

diff --git a/po/ko.po b/po/ko.po
index 3c9773c..5ed3285 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.4\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-0400\n"
 "PO-Revision-Date: 2002-03-04 17:17+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -3190,164 +3190,153 @@ msgstr "%s 
 msgid "no dbpath has been set\n"
 msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 "%3$s À妽º¿¡¼­ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:1686
-#, fuzzy, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr "%3$s(À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n"
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
-#, fuzzy, c-format
-msgid "h#%7u: %s"
-msgstr "%s: %s\n"
-
-#: rpmdb/rpmdb.c:2304
+#: rpmdb/rpmdb.c:1690
 #, fuzzy, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
-msgstr "rpmdb: ¼Õ»óµÈ Çì´õ #%u(ÀÌ)°¡ º¹±¸(retrieved)µÇ¾ú½À´Ï´Ù, »ý·«ÇÕ´Ï´Ù.\n"
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "%3$s(À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, fuzzy, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: ¼Õ»óµÈ Çì´õ #%u(ÀÌ)°¡ º¹±¸(retrieved)µÇ¾ú½À´Ï´Ù, »ý·«ÇÕ´Ï´Ù.\n"
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: 0x%xÀÇ Çì´õ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 "%3$s À妽º¿¡¼­ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "%2$s À妽º¿¡¼­ \"%1$s\"(À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n"
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "%2$s À妽º¿¡¼­ %1$d Ç׸ñµé(entries)À» »èÁ¦ÇÕ´Ï´Ù.\n"
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 "%3$s À妽º¿¡¼­ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "%3$s(À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "%3$s¿¡¼­ %2$s ·¹Äڵ带 »èÁ¦ÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "»õ·Î¿î ÆÐÅ°Áö¸¦ ¹èÄ¡ÇÏ´Â µµÁß ¿À·ù(%d)°¡ ¹ß»ýÇß½À´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "%2$s À妽º¿¡ \"%1$s\"(À»)¸¦ Ãß°¡ÇÕ´Ï´Ù.\n"
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "%2$s À妽º¿¡ %1$d Ç׸ñµé(entries)À» Ãß°¡ÇÕ´Ï´Ù.\n"
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "%3$s(À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "db3¸¦ À籸ÃàÇÑ ÈÄ¿¡ %s(À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n"
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù"
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "%2$s¿¡ %1$s µ¥ÀÌÅͺ£À̽º¸¦ À籸Ãà ÇÕ´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "Àӽà µ¥ÀÌÅͺ£À̽º %s(ÀÌ)°¡ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, c-format
 msgid "creating directory %s\n"
 msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÕ´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÔ: %s\n"
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "dbapi %d·Î ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "dbapi %d·Î »õ·Î¿î µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "µ¥ÀÌÅͺ£À̽ºÀÇ ·¹ÄÚµå ¹øÈ£ %u(ÀÌ)°¡ À߸øµÇ¾ú½À´Ï´Ù -- »ý·«ÇÕ´Ï´Ù.\n"
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "%u¿¡ óÀ½ºÎÅÍ ·¹Äڵ带 Ãß°¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "µ¥ÀÌÅͺ£À̽º¸¦ À籸ÃàÇϴµ¥ ½ÇÆÐÇÔ: ¿øº» µ¥ÀÌÅͺ£À̽º´Â ±×´ë·Î À¯ÁöµË´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr "ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ »õ·Î¿î µ¥ÀÌÅͺ£À̽º·Î ±³Ã¼Çϴµ¥ ½ÇÆÐÇß½À´Ï´Ù!\n"
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "º¹±¸Çϱâ À§ÇØ %2$sÀÇ ÆÄÀÏÀ» %1$sÀÇ ÆÄÀÏ·Î ±³Ã¼ÇÕ´Ï´Ù"
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, c-format
 msgid "removing directory %s\n"
 msgstr "%s µð·ºÅ丮¸¦ »èÁ¦ÇÕ´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "%s µð·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆÐÇÔ: %s\n"
@@ -3622,6 +3611,15 @@ msgstr "%s: 
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Àдµ¥ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
 
+#, fuzzy
+#~ msgid "h#%7u: %s"
+#~ msgstr "%s: %s\n"
+
+#, fuzzy
+#~ msgid "rpmdb: header #%u: %s -- skipping.\n"
+#~ msgstr ""
+#~ "rpmdb: ¼Õ»óµÈ Çì´õ #%u(ÀÌ)°¡ º¹±¸(retrieved)µÇ¾ú½À´Ï´Ù, »ý·«ÇÕ´Ï´Ù.\n"
+
 #~ msgid "unexpected arguments to --querytags "
 #~ msgstr "--querytags ¿É¼Ç¿¡ ºÎÀûÀýÇÑ Àμö°¡ ÁöÁ¤µÇ¾ú½À´Ï´Ù "
 

diff --git a/po/no.po b/po/no.po
index d1c82b4..e67efca 100644 (file)
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-0400\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -3164,160 +3164,149 @@ msgstr "kan ikke 
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1686
-#, fuzzy, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr "feil(%d) under lagring av post %s til %s\n"
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, fuzzy, c-format
-msgid "h#%7u: %s"
-msgstr "%s: %s\n"
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
-msgstr ""
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "feil(%d) under lagring av post %s til %s\n"
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "feil(%d) under lagring av post %s til %s\n"
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "feil(%d) under fjerning av post %s fra %s\n"
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "feil(%d) under lagring av post %s til %s\n"
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "feil(%d) under fjerning av post %s fra %s\n"
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "feil(%d) under lagring av post %s til %s\n"
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
@@ -3589,6 +3578,10 @@ msgstr "%s: 
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: lesing av manifest feilet: %s\n"
 
+#, fuzzy
+#~ msgid "h#%7u: %s"
+#~ msgstr "%s: %s\n"
+
 #~ msgid "unexpected arguments to --querytags "
 #~ msgstr "uventede argumenter til --querytags "
 

diff --git a/po/pl.po b/po/pl.po
index 01351b8..445a368 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-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"
@@ -3261,161 +3261,150 @@ msgstr "nie mo
 msgid "no dbpath has been set\n"
 msgstr "¶cie¿ka bazy danych nie zosta³a podana"
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "b³±d pobierania rekordu %s z %s"
 
-#: rpmdb/rpmdb.c:1686
-#, fuzzy, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr "b³±d zapisywania rekordu %s do %s"
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, fuzzy, c-format
-msgid "h#%7u: %s"
-msgstr "plik %s: %s\n"
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
-msgstr ""
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "b³±d zapisywania rekordu %s do %s"
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "nie mo¿na odczytaæ nag³ówka przy %d dla poszukiwania"
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "b³±d pobierania rekordu %s z %s"
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "usuwanie indeksu grupy\n"
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "usuwanie indeksu nazw\n"
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "b³±d pobierania rekordu %s z %s"
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "b³±d zapisywania rekordu %s do %s"
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "b³±d usuwania rekordu %s z %s"
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "b³±d szukania pakietu %s\n"
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "zmiana nazwy %s na %s\n"
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "zmiana nazwy %s na %s\n"
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "b³±d zapisywania rekordu %s do %s"
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr "¶cie¿ka bazy danych nie zosta³a podana"
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "odbudowywujê bazê danych w rootdir %s\n"
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "tymczasowa baza danych %s ju¿ istnieje"
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otwieranie starej bazy danych\n"
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otwieranie nowej bazy danych\n"
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "rekord numer %d w bazie danych jest b³êdny -- rekord pominiêto"
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "nie mo¿na dodaæ rekordu oryginalnie przy %d"
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 #, 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"
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr "zamiana starej bazy na now± nie powiod³a siê!\n"
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, 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"
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n"
@@ -3692,6 +3681,10 @@ msgstr "%s: Open nie powiod
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
+#, fuzzy
+#~ msgid "h#%7u: %s"
+#~ msgstr "plik %s: %s\n"
+
 #~ msgid "unexpected arguments to --querytags "
 #~ msgstr "nieoczekiwane argumenty dla --querytags "
 

diff --git a/po/pt.po b/po/pt.po
index b91cf67..73fdf2b 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-0400\n"
 "PO-Revision-Date: 2002-02-14 10:51+0000\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n"
 "Language-Team: pt <morais@kde.org\n"
@@ -3198,161 +3198,150 @@ msgstr "n
 msgid "no dbpath has been set\n"
 msgstr "não foi definido o dbpath\n"
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n"
 
-#: rpmdb/rpmdb.c:1686
-#, fuzzy, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr "erro(%d) ao guardar o registo %s em %s\n"
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
-#, fuzzy, c-format
-msgid "h#%7u: %s"
-msgstr "%s: %s\n"
-
-#: rpmdb/rpmdb.c:2304
+#: rpmdb/rpmdb.c:1690
 #, fuzzy, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
-msgstr "rpmdb: recebida instância do cabeçalho #%u estragada, a ignorar.\n"
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "erro(%d) ao guardar o registo %s em %s\n"
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, fuzzy, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: recebida instância do cabeçalho #%u estragada, a ignorar.\n"
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: não consigo ler o cabeçalho em 0x%x\n"
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n"
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "a remover o \"%s\" do índice %s.\n"
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "a remover %d registos do índice %s.\n"
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n"
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "erro(%d) ao guardar o registo %s em %s\n"
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "erro(%d) ao remover o registo %s do %s\n"
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "erro(%d) ao criar uma nova instância do pacote\n"
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "a adicionar o \"%s\" ao índice %s.\n"
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "a adicionar %d registos ao índice %s.\n"
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "erro(%d) ao guardar o registo %s em %s\n"
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "a remover o %s depois duma reconstrução bem sucedida do db3.\n"
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr "não foi definido o dbpath"
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "a reconstruir a base de dados %s em %s\n"
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "A base de dados temporária %s já existe\n"
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, c-format
 msgid "creating directory %s\n"
 msgstr "a criar a directoria %s\n"
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "a criar a directoria %s: %s\n"
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "a abrir a base de dados antiga com a dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "a abrir a base de dados nova com a dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "o número do registo %u na base de dados está errado -- a ignorar.\n"
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "não consigo adicionar o registo originalmente em %u\n"
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "falhou a reconstrução da base de dados: a base de dados original mantém-se\n"
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr "falhou a substituição da base de dados antiga pela nova!\n"
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "substituir os ficheiros em %s por ficheiros de %s a recuperar"
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, c-format
 msgid "removing directory %s\n"
 msgstr "a remover a directoria %s\n"
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "falhou a remoção da directoria %s: %s\n"
@@ -3626,6 +3615,14 @@ msgstr "%s: o acesso falhou: %s\n"
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: a leitura do manifesto falhou: %s\n"
 
+#, fuzzy
+#~ msgid "h#%7u: %s"
+#~ msgstr "%s: %s\n"
+
+#, fuzzy
+#~ msgid "rpmdb: header #%u: %s -- skipping.\n"
+#~ msgstr "rpmdb: recebida instância do cabeçalho #%u estragada, a ignorar.\n"
+
 #~ msgid "unexpected arguments to --querytags "
 #~ msgstr "argumentos inesperados no --querytags "
 

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3051424..bb10200 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-0400\n"
 
 #: build.c:40
 #, fuzzy
@@ -3453,161 +3453,149 @@ msgid "no dbpath has been set\n"
 msgstr ""
 
 # , c-format
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "No consegui abrir: %s\n"
 
-# , c-format
-#: rpmdb/rpmdb.c:1686
-#, fuzzy, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr "No consegui abrir: %s\n"
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
 # , c-format
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, fuzzy, c-format
-msgid "h#%7u: %s"
-msgstr "No consegui ler o arquivo spec de %s\n"
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
-msgstr ""
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "No consegui abrir: %s\n"
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "no foi passado pacote para desinstalao"
 
 # , c-format
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
 # , c-format
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "no foi passado pacote para instalao"
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
 # , c-format
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
 # , c-format
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, 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"
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, 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"
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
@@ -3620,13 +3608,13 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "RPM verso %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -3905,6 +3893,11 @@ msgstr "No consegui abrir: %s\n"
 msgid "%s: read manifest failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
+# , c-format
+#, fuzzy
+#~ msgid "h#%7u: %s"
+#~ msgstr "No consegui ler o arquivo spec de %s\n"
+
 #~ msgid "unexpected arguments to --querytags "
 #~ msgstr "argumentos no esperados em --querytags"
 

diff --git a/po/ro.po b/po/ro.po
index 690e69b..1df524f 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-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"
@@ -3106,160 +3106,149 @@ msgstr ""
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1686
-#, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, c-format
-msgid "h#%7u: %s"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/rpm.pot b/po/rpm.pot
index 70a1e7a..74bf2b8 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-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"
@@ -3112,160 +3112,149 @@ msgstr ""
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1686
-#, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, c-format
-msgid "h#%7u: %s"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/ru.po b/po/ru.po
index e09f558..2259595 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-0400\n"
 "PO-Revision-Date: 2002-04-09 16:44-0400\n"
 "Last-Translator: Eugene Kanter, <eugene@bcl.bz>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -3198,161 +3198,150 @@ msgstr "
 msgid "no dbpath has been set\n"
 msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n"
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n"
 
-#: rpmdb/rpmdb.c:1686
-#, fuzzy, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n"
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
-#, fuzzy, c-format
-msgid "h#%7u: %s"
-msgstr "%s: %s\n"
-
-#: rpmdb/rpmdb.c:2304
+#: rpmdb/rpmdb.c:1690
 #, fuzzy, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
-msgstr "rpmdb: ÐÏÌÕÞÅÎ ÐÏ×ÒÅÖÄÅÎÎÙÊ ÚÁÇÏÌÏ×ÏË #%u, ÐÒÏÐÕÓËÁÅÔÓÑ.\n"
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n"
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, fuzzy, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: ÐÏÌÕÞÅÎ ÐÏ×ÒÅÖÄÅÎÎÙÊ ÚÁÇÏÌÏ×ÏË #%u, ÐÒÏÐÕÓËÁÅÔÓÑ.\n"
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ ÚÁÇÏÌÏ×ÏË × 0x%x\n"
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n"
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "ÕÄÁÌÑÅÔÓÑ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s.\n"
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "ÕÄÁÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ ÉÚ ÉÎÄÅËÓÁ %s.\n"
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n"
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n"
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "ÏÛÉÂËÁ(%d) ÕÄÁÌÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s\n"
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "ÏÛÉÂËÁ(%d) ÒÅÚÅÒ×ÉÒÏ×ÁÎÉÑ ÐÁÍÑÔÉ ÄÌÑ ÏÂÒÁÚÁ ÎÏ×ÏÇÏ ÐÁËÅÔÁ\n"
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ \"%s\" × ÉÎÄÅËÓ %s.\n"
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ × ÉÎÄÅËÓ %s\n"
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n"
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "ÕÄÁÌÑÅÔÓÑ %s ÐÏÓÌÅ ÕÓÐÅÛÎÏÇÏ ÚÁ×ÅÒÛÅÎÉÑ ÐÅÒÅÉÎÄÅËÁÃÉÉ ÂÁÚÙ × db3.\n"
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ"
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "ÐÅÒÅÓÔÒÁÉ×ÁÅÔÓÑ ÂÁÚÁ ÄÁÎÎÙÈ %s × %s\n"
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "×ÒÅÍÅÎÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ\n"
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, c-format
 msgid "creating directory %s\n"
 msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s\n"
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s: %s\n"
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÎÏ×ÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "ÚÁÐÉÓØ ÎÏÍÅÒ %u × ÂÁÚÅ ÄÁÎÎÙÈ ÎÅ×ÅÒÎÁ, ÐÒÏÐÕÓËÁÅÔÓÑ.\n"
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÚÁÐÉÓØ (ÐÅÒ×ÏÎÁÞÁÌØÎÏ × %u)\n"
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "ÐÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n"
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÍÅÎÉÔØ ÓÔÁÒÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÎÁ ÎÏ×ÕÀ!\n"
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "ÆÁÊÌÙ × %s ÚÁÍÅÎÑÀÔÓÑ ÆÁÊÌÁÍÉ ÉÚ %s ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ"
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, c-format
 msgid "removing directory %s\n"
 msgstr "ÕÄÁÌÑÅÔÓÑ ËÁÔÁÌÏÇ %s\n"
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n"
@@ -3626,6 +3615,14 @@ msgstr "%s: 
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ ÞÔÅÎÉÑ ÓÐÉÓËÁ ÆÁÊÌÏ×: %s\n"
 
+#, fuzzy
+#~ msgid "h#%7u: %s"
+#~ msgstr "%s: %s\n"
+
+#, fuzzy
+#~ msgid "rpmdb: header #%u: %s -- skipping.\n"
+#~ msgstr "rpmdb: ÐÏÌÕÞÅÎ ÐÏ×ÒÅÖÄÅÎÎÙÊ ÚÁÇÏÌÏ×ÏË #%u, ÐÒÏÐÕÓËÁÅÔÓÑ.\n"
+
 #~ msgid "unexpected arguments to --querytags "
 #~ msgstr "ÎÅÏÖÉÄÁÎÎÙÅ ÁÒÇÕÍÅÎÔÙ ÄÌÑ --querytags "
 

diff --git a/po/sk.po b/po/sk.po
index 140a5f2..469720f 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-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"
@@ -3257,161 +3257,150 @@ msgstr "nie je mo
 msgid "no dbpath has been set\n"
 msgstr "nebola nastavená ¾iadna dbpath"
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "chyba pri naèítaní záznamu %s z %s"
 
-#: rpmdb/rpmdb.c:1686
-#, fuzzy, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr "chyba pri zápise záznamu %s do %s"
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, fuzzy, c-format
-msgid "h#%7u: %s"
-msgstr "súbor %s: %s\n"
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
-msgstr ""
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "chyba pri zápise záznamu %s do %s"
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "nie je mo¾né preèíta» hlavièku na %d pre vyhµadanie"
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "chyba pri naèítaní záznamu %s z %s"
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstraòuje sa index skupín\n"
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "odstraòuje sa index názvov\n"
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "chyba pri naèítaní záznamu %s z %s"
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "chyba pri zápise záznamu %s do %s"
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "chyba pri odstraòovaní záznamu %s z %s"
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "chyba pri hµadaní balíka %s\n"
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "premenováva sa %s na %s\n"
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "premenováva sa %s na %s\n"
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "chyba pri zápise záznamu %s do %s"
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr "nebola nastavená ¾iadna dbpath"
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "znovu sa vytvára databáza v adresári %s\n"
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "doèasná databáza %s u¾ existuje"
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otvára sa stará databáza\n"
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otvára sa nová databáza\n"
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "záznam èíslo %d v databáze je chybný -- bol vynechaný"
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "nie je mo¾né prida» záznam pôvodne na %d"
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "nepodarilo sa znovu vytvori» databázu; zostáva pôvodná\n"
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr "nepodarilo sa nahradi» starú databázu novou!\n"
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, 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"
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "nepodarilo sa odstráni» adresár %s: %s\n"
@@ -3688,6 +3677,10 @@ msgstr "%s: otvorenie zlyhalo\n"
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
+#, fuzzy
+#~ msgid "h#%7u: %s"
+#~ msgstr "súbor %s: %s\n"
+
 #~ msgid "unexpected arguments to --querytags "
 #~ msgstr "neoèakávané argumenty pre --querytags"
 

diff --git a/po/sl.po b/po/sl.po
index ae02569..26537a3 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.299 2002/08/02 16:46:13 jbj Exp $
+# $Id: sl.po,v 1.300 2002/08/02 21:52:32 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-0400\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -3262,163 +3262,152 @@ msgstr "ni mo
 msgid "no dbpath has been set\n"
 msgstr "dbpath ni nastavljena"
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
 
-#: rpmdb/rpmdb.c:1686
-#, fuzzy, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr "napaka(%d) pri pisanju zapisa %s v %s"
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, fuzzy, c-format
-msgid "h#%7u: %s"
-msgstr "datoteka %s: %s\n"
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
-msgstr ""
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "napaka(%d) pri pisanju zapisa %s v %s"
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: ni mo¾no prebrati glave pri 0x%x"
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstranjevanje \"%s\" iz kazala %s.\n"
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "odstranjevanje %d vnosov iz kazala %s\n"
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "napaka(%d) pri pisanju zapisa %s v %s"
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "napaka(%d) pri brisanju zapisa %s iz %s"
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "napaka(%d) pri iskanju paketa %s\n"
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "dodajanje \"%s\" v kazalo %s.\n"
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "dodajanje %d vnosov v kazalo %s.\n"
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "napaka(%d) pri pisanju zapisa %s v %s"
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr "dbpath ni nastavljena"
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n"
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "zaèasna podatkovna zbirka %s ¾e obstaja"
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "ustvarjanje imenika: %s\n"
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "ustvarjanje imenika: %s\n"
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "odpiranje stare podatkovne zbirke\n"
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "odpiramo nove podatkovne zbirke z dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "zapis ¹t. %d v zbirki je po¹kodovan -- preskoèeno."
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "zapisa ni mo¾no dodati na %d"
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "ponovna izgradnja podatkovne zbirke je bila neuspe¹na; stara ostaja na\n"
 "istem mestu\n"
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspe¹na!\n"
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "poskus povrnitve z nadomestitvijo datotek v %s z datotekami v %s"
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "odstranjevanje imenika: %s\n"
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspe¹na odstranitev imenika %s: %s\n"
@@ -3695,6 +3684,10 @@ msgstr "%s: odpiranje je bilo neuspe
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
 
+#, fuzzy
+#~ msgid "h#%7u: %s"
+#~ msgstr "datoteka %s: %s\n"
+
 #~ msgid "unexpected arguments to --querytags "
 #~ msgstr "neprièakovani argumenti za --querytags "
 

diff --git a/po/sr.po b/po/sr.po
index c3119c7..b5d7844 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-0400\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 
@@ -3250,160 +3250,149 @@ msgstr "gre
 msgid "no dbpath has been set\n"
 msgstr "dbpath nije odreðen"
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "gre¹ka kod uzimanja sloga %s iz %s"
 
-#: rpmdb/rpmdb.c:1686
-#, fuzzy, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr "gre¹ka zapisivanja sloga %s u %s"
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, fuzzy, c-format
-msgid "h#%7u: %s"
-msgstr "neuspelo otvaranje %s: %s"
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
-msgstr ""
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "gre¹ka zapisivanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "ne mogu da proèitam zaglavlje na %d za proveru"
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "gre¹ka kod uzimanja sloga %s iz %s"
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "gre¹ka kod uzimanja sloga %s iz %s"
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "gre¹ka zapisivanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "gre¹ka kod potrage za paketom %s\n"
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "gre¹ka zapisivanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr "dbpath nije odreðen"
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "privremena baza podataka %s veæ postoji"
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "slog broj %d u bazi podataka je neispravan -- preskaèem ga"
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "ne mogu da dodam slog originalno na %d"
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
@@ -3687,6 +3676,10 @@ msgstr "%s: Neuspelo otvaranje\n"
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
+#, fuzzy
+#~ msgid "h#%7u: %s"
+#~ msgstr "neuspelo otvaranje %s: %s"
+
 #~ msgid "unexpected arguments to --querytags "
 #~ msgstr "neoèekivani argumenti za --querytags"
 

diff --git a/po/sv.po b/po/sv.po
index 6966720..371c5ba 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.1\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-0400\n"
 "PO-Revision-Date: 2002-07-11 22:49+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -3149,160 +3149,149 @@ msgstr "kan inte 
 msgid "no dbpath has been set\n"
 msgstr "ingen dbpath har satts\n"
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "fel(%d) när \"%s\"-poster hämtades från %s-indexet\n"
 
-#: rpmdb/rpmdb.c:1686
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
+msgstr ""
+
+#: rpmdb/rpmdb.c:1690
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "fel(%d) när post nr. %d sparades i %s\n"
 
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2298
-#, fuzzy, c-format
-msgid "h#%7u: %s"
-msgstr "%s: %s\n"
-
-#: rpmdb/rpmdb.c:2304
-#, fuzzy, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
-msgstr "rpmdb: skadad huvudinstans #%u hämtad, hoppar över.\n"
-
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, fuzzy, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: skadad huvudinstans #%u hämtad, hoppar över.\n"
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: kan inte läsa huvud vid 0x%x\n"
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "fel(%d) när huvudpost nr. %d  för %s skulle tas bort\n"
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "tar bort \"%s\" från %s-indexet.\n"
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "tar bort %d poster från %s-indexet.\n"
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "fel(%d) när \"%s\"-poster från %s-indexet sattes\n"
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "fel(%d) när post \"%s\" sparades i %s\n"
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "fel(%d) när post \"%s\" togs bort från %s\n"
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "fel(%d) vid allokering av ny paketinstans\n"
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "lägger till \"%s\" till %s-indexet.\n"
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "lägger till %d poster till %s-indexet.\n"
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "fel(%d) när post %s sparades i %s\n"
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "tar bort %s efter lyckad db3-ombyggnad.\n"
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr "ingen dbpath har satts"
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "bygger om databas %s till %s\n"
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "tillfällig databas %s existerar redan\n"
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, c-format
 msgid "creating directory %s\n"
 msgstr "skapar katalog %s\n"
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "skapar katalog %s: %s\n"
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "öppnar gammal databas med dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "öppnar ny databas med dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "post nummer %u i databasen är felaktig -- hoppar över.\n"
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "kan inte lägga till post ursprungligen vid %u\n"
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n"
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr "kunde inte ersätta gammal databas med ny databas!\n"
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, 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"
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, c-format
 msgid "removing directory %s\n"
 msgstr "tar bort katalog %s\n"
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunde inte ta bort katalogen %s: %s\n"
@@ -3573,6 +3562,14 @@ msgstr "%s: cacheoperation misslyckades: ec %d.\n"
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: läsning av paketlista misslyckades: %s\n"
 
+#, fuzzy
+#~ msgid "h#%7u: %s"
+#~ msgstr "%s: %s\n"
+
+#, fuzzy
+#~ msgid "rpmdb: header #%u: %s -- skipping.\n"
+#~ msgstr "rpmdb: skadad huvudinstans #%u hämtad, hoppar över.\n"
+
 #~ msgid "unexpected arguments to --querytags "
 #~ msgstr "oväntade argument till --querytags "
 

diff --git a/po/tr.po b/po/tr.po
index c156673..bc19d80 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-0400\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -3208,162 +3208,151 @@ msgstr "%s indeksi a
 msgid "no dbpath has been set\n"
 msgstr "belirtilmiþ bir dbpath deðeri yok\n"
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n"
 
-#: rpmdb/rpmdb.c:1686
-#, fuzzy, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n"
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
-#, fuzzy, c-format
-msgid "h#%7u: %s"
-msgstr "dosya %s: %s\n"
-
-#: rpmdb/rpmdb.c:2304
+#: rpmdb/rpmdb.c:1690
 #, fuzzy, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
-msgstr "rpmdb: bozuk baþlýk örneði #%u alýndý, atlanýyor.\n"
+msgid "error(%d) storing record #%d into %s\n"
+msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n"
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, fuzzy, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: bozuk baþlýk örneði #%u alýndý, atlanýyor.\n"
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: 0x%x de baþlýk okunamadý\n"
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n"
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "\"%s\" %s indeksinden siliniyor.\n"
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "%d girdi %s indeksinden siliniyor.\n"
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n"
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n"
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "hata(%d) %s kaydýn %s dosyasýndan silinmesi\n"
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "yeni paket örneðini tutma hatasý(%d)\n"
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "\"%s\" %s indeksine ekleniyor.\n"
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "%d girdi %s indeksine ekleniyor.\n"
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n"
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "baþarýlý db3 yeniden oluþturma ertesinde %s kaldýrýlýyor\n"
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr "belirtilmiþ bir dbpath yok"
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "%s veritabaný %s içinde yeniden oluþturuluyor\n"
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "geçici veritabaný %s zaten mevcut\n"
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, c-format
 msgid "creating directory %s\n"
 msgstr "%s dizini oluþturuluyor\n"
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "%s dizini oluþturuluyor: %s\n"
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "eski veritabaný dbapi %d ile açýlýyor\n"
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "yeni veritabaný dbapi %d ile açýlýyor\n"
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "veritabanýndaki %u. kayýt hatalý -- atlanýyor\n"
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "kayýt özgün olarak %u e eklenemedi\n"
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "veritabaný yeniden oluþturulamadý: mevcut veritabaný deðiþmeden\n"
 "yerinde býrakýldý\n"
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr "eski veritabanýnýn yenisiyle deðiþtirilirmesi baþarýsýz!\n"
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "kurtarmak için %s içindeki dosyalar %s deki dosyalarla deðiþtiriliyor"
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, c-format
 msgid "removing directory %s\n"
 msgstr "%s dizini siliniyor\n"
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "%s dizininin silinmesi baþarýsýz: %s\n"
@@ -3637,6 +3626,14 @@ msgstr "%s: a
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: bildirge okuma baþarýsýz: %s\n"
 
+#, fuzzy
+#~ msgid "h#%7u: %s"
+#~ msgstr "dosya %s: %s\n"
+
+#, fuzzy
+#~ msgid "rpmdb: header #%u: %s -- skipping.\n"
+#~ msgstr "rpmdb: bozuk baþlýk örneði #%u alýndý, atlanýyor.\n"
+
 #~ msgid "unexpected arguments to --querytags "
 #~ msgstr "--querytags ile beklenmeyen girdiler"
 

diff --git a/po/uk.po b/po/uk.po
index ffa1fd6..3f58eca 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-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"
@@ -3111,160 +3111,149 @@ msgstr ""
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1686
-#, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, c-format
-msgid "h#%7u: %s"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/wa.po b/po/wa.po
index ffa1fd6..3f58eca 100644 (file)
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-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"
@@ -3111,160 +3111,149 @@ msgstr ""
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1686
-#, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, c-format
-msgid "h#%7u: %s"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/zh.po b/po/zh.po
index ffa1fd6..3f58eca 100644 (file)
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-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"
@@ -3111,160 +3111,149 @@ msgstr ""
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1686
-#, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, c-format
-msgid "h#%7u: %s"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index ffa1fd6..3f58eca 100644 (file)
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-02 12:45-0400\n"
+"POT-Creation-Date: 2002-08-02 17:50-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"
@@ -3111,160 +3111,149 @@ msgstr ""
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2405
-#: rpmdb/rpmdb.c:2513 rpmdb/rpmdb.c:3230
+#: rpmdb/rpmdb.c:1254 rpmdb/rpmdb.c:1387 rpmdb/rpmdb.c:1437 rpmdb/rpmdb.c:2410
+#: rpmdb/rpmdb.c:2518 rpmdb/rpmdb.c:3247
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1686
-#, c-format
-msgid "error(%d) storing record #%d into %s\n"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2289
-#, c-format
-msgid "h#%7u: already checked.\n"
+#: rpmdb/rpmdb.c:1680 rpmdb/rpmdb.c:2303 rpmdb/rpmdb.c:3050
+msgid "rpmdb: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2298
+#: rpmdb/rpmdb.c:1690
 #, c-format
-msgid "h#%7u: %s"
-msgstr ""
-
-#: rpmdb/rpmdb.c:2304
-#, c-format
-msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2325
+#: rpmdb/rpmdb.c:2330
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2601
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2664
+#: rpmdb/rpmdb.c:2669
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2779
+#: rpmdb/rpmdb.c:2784
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2783
+#: rpmdb/rpmdb.c:2788
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2811
+#: rpmdb/rpmdb.c:2816
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2832
+#: rpmdb/rpmdb.c:2837
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2842
+#: rpmdb/rpmdb.c:2847
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2991
+#: rpmdb/rpmdb.c:2996
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:3222
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3209
+#: rpmdb/rpmdb.c:3226
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3249
+#: rpmdb/rpmdb.c:3266
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3610
+#: rpmdb/rpmdb.c:3627
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3648
+#: rpmdb/rpmdb.c:3665
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3680
+#: rpmdb/rpmdb.c:3697
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3684
+#: rpmdb/rpmdb.c:3701
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3690
+#: rpmdb/rpmdb.c:3707
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3692
+#: rpmdb/rpmdb.c:3709
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3699
+#: rpmdb/rpmdb.c:3716
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3712
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3741
+#: rpmdb/rpmdb.c:3758
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3781
+#: rpmdb/rpmdb.c:3798
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3799
+#: rpmdb/rpmdb.c:3816
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3807
+#: rpmdb/rpmdb.c:3824
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3809
+#: rpmdb/rpmdb.c:3826
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3819
+#: rpmdb/rpmdb.c:3836
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3821
+#: rpmdb/rpmdb.c:3838
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""

diff --git a/python/rpmts-py.c b/python/rpmts-py.c
index 03e28ed..65f53e6 100644 (file)
--- a/python/rpmts-py.c
+++ b/python/rpmts-py.c
@@ -37,8 +37,14 @@ static int _rpmts_debug = 0;
  * installation and upgrade of packages.  The rpm.ts object is
  * instantiated by the TransactionSet function in the rpm module.
  *
- * The TransactionSet function takes a single optional argument. The first
- * argument is the root path.
+ * The TransactionSet function takes two optional arguments. The first
+ * argument is the root path. The second is the verify signature flags,
+ * the sum of the following flags:
+ *
+ * -    1  --nodigest      if set, don't check digest.
+ * -    2  --nosignature   if set, don't check signature.
+ * -    4  --nolegacy      if set, check header+payload (if possible).
+ * -    8  --nohdrchk      if set, don't check rpmdb headers.
  *
  * A rpm.ts object has the following methods:
  *
@@ -992,14 +998,16 @@ rpmts_Create(/*@unused@*/ PyObject * self, PyObject * args)
 {
     rpmtsObject * o;
     char * rootDir = "/";
+    int vsflags = rpmExpandNumeric("%{?_vsflags_up2date}");
 
-    if (!PyArg_ParseTuple(args, "|s:Create", &rootDir))
+    if (!PyArg_ParseTuple(args, "|si:Create", &rootDir, &vsflags))
        return NULL;
 
     o = (void *) PyObject_NEW(rpmtsObject, &rpmts_Type);
 
     o->ts = rpmtsCreate();
     (void) rpmtsSetRootDir(o->ts, rootDir);
+    (void) rpmtsSetVerifySigFlags(o->ts, vsflags);
 
     o->keyList = PyList_New(0);
     o->scriptFd = NULL;

diff --git a/rpm.spec.in b/rpm.spec.in
index ce060ec..a2d602d 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -17,7 +17,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.66
+Release: 0.67
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL
@@ -517,11 +517,15 @@ fi
 %{__prefix}/include/popt.h
 
 %changelog
-* Fri Aug  2 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.66
+* Fri Aug  2 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.67
 - fix: identify athlon with 3DNOWEXT as "athlon", not "i786" (#70539).
 - fix: repair --root with --verify (#70527).
 - fix: signed pubkeys were imported incorrectly (#68291).
 - include tgpg script to verify signatures using only gpg.
+- check header blobs on export (i.e. rpmdbAdd())..
+- enable iterator header blob checks for install/erase modes.
+- python: _vsflags_up2date macro to configure verify signature flags.
+
 
 * Thu Aug  1 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.63
 - add check-files to rpm-build manifest.

diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c
index a369d30..7e433e4 100644 (file)
--- a/rpmdb/rpmdb.c
+++ b/rpmdb/rpmdb.c
@@ -1661,6 +1661,7 @@ static int miFreeHeader(rpmdbMatchIterator mi, dbiIndex dbi)
        DBT * key = &mi->mi_key;
        DBT * data = &mi->mi_data;
        sigset_t signalMask;
+       rpmRC rpmrc = RPMRC_NOTFOUND;
        int xx;
 
 /*@i@*/        key->data = (void *) &mi->mi_prevoffset;
@@ -1668,17 +1669,20 @@ static int miFreeHeader(rpmdbMatchIterator mi, dbiIndex dbi)
        data->data = headerUnload(mi->mi_h);
        data->size = headerSizeof(mi->mi_h, HEADER_MAGIC_NO);
 
-#ifdef NOTYET
-       /* Check header digest/signature (if requested). */
-       if (mi->mi_ts && mi->mi_hdrchk) {
+       /* Check header digest/signature on blob export (if requested). */
+       if (mi->mi_hdrchk && mi->mi_ts) {
            const char * msg = NULL;
-           rpmRC rpmrc;
+           int lvl;
+
            rpmrc = (*mi->mi_hdrchk) (mi->mi_ts, data->data, data->size, &msg);
+           lvl = (rpmrc == RPMRC_FAIL ? RPMMESS_ERROR : RPMMESS_DEBUG);
+           rpmMessage(lvl, "%s h#%8u %s",
+               (rpmrc == RPMRC_FAIL ? _("rpmdb: skipping") : "write"),
+                       mi->mi_prevoffset, (msg ? msg : "\n"));
            msg = _free(msg);
        }
-#endif
 
-       if (data->data != NULL) {
+       if (data->data != NULL && rpmrc != RPMRC_FAIL) {
            (void) blockSignals(dbi->dbi_rpmdb, &signalMask);
            rc = dbiPut(dbi, mi->mi_dbc, key, data, DB_KEYLAST);
            if (rc) {
@@ -2277,36 +2281,37 @@ top:
     /* Check header digest/signature once (if requested). */
 /*@-boundsread -branchstate -sizeoftype @*/
     if (mi->mi_hdrchk && mi->mi_ts) {
-       const char * msg = NULL;
-       pbm_set * set = NULL;
        rpmRC rpmrc = RPMRC_NOTFOUND;
+       pbm_set * set = NULL;
 
+       /* Don't bother re-checking a previously read header. */
        if (mi->mi_db->db_bits) {
            set = PBM_REALLOC((pbm_set **)&mi->mi_db->db_bits,
                        &mi->mi_db->db_nbits, mi->mi_offset);
-           if (PBM_ISSET(mi->mi_offset, set)) {
-#ifdef NOISY
-               rpmMessage(RPMMESS_DEBUG, _("h#%7u: already checked.\n"),
-                       mi->mi_offset);
-#endif
+           if (PBM_ISSET(mi->mi_offset, set))
                rpmrc = RPMRC_OK;
-           }
        }
-       if (rpmrc == RPMRC_NOTFOUND) {
+
+       /* If blob is unchecked, check blob import consistency now. */
+       if (rpmrc != RPMRC_OK) {
+           const char * msg = NULL;
+           int lvl;
+
            rpmrc = (*mi->mi_hdrchk) (mi->mi_ts, uh, uhlen, &msg);
-           if (msg)
-               rpmMessage(RPMMESS_DEBUG, _("h#%7u: %s"),
-                       mi->mi_offset, msg);
+           lvl = (rpmrc == RPMRC_FAIL ? RPMMESS_ERROR : RPMMESS_DEBUG);
+           rpmMessage(lvl, "%s h#%8u %s",
+               (rpmrc == RPMRC_FAIL ? _("rpmdb: skipping") : " read"),
+                       mi->mi_offset, (msg ? msg : "\n"));
+           msg = _free(msg);
+
+           /* Mark header checked. */
            if (set && rpmrc == RPMRC_OK)
                PBM_SET(mi->mi_offset, set);
+
+           /* Skip damaged and inconsistent headers. */
+           if (rpmrc == RPMRC_FAIL)
+               goto top;
        }
-       if (rpmrc == RPMRC_FAIL) {
-           rpmError(RPMERR_BADHEADER, _("rpmdb: header #%u: %s -- skipping.\n"),
-                       mi->mi_offset, (msg ? msg : ""));
-           msg = _free(msg);
-           goto top;
-       }
-       msg = _free(msg);
     }
 /*@=boundsread =branchstate =sizeoftype @*/
 
@@ -2613,7 +2618,7 @@ memset(data, 0, sizeof(*data));
 
     {  const char *n, *v, *r;
        (void) headerNVR(h, &n, &v, &r);
-       rpmMessage(RPMMESS_DEBUG, "  --- %10u %s-%s-%s\n", hdrNum, n, v, r);
+       rpmMessage(RPMMESS_DEBUG, "  --- h#%8u %s-%s-%s\n", hdrNum, n, v, r);
     }
 
     (void) blockSignals(db, &signalMask);
@@ -3005,8 +3010,10 @@ memset(data, 0, sizeof(*data));
            int rpmcnt = 0;
            int rpmtag;
            int_32 * requireFlags;
+           rpmRC rpmrc;
            int i, j;
 
+           rpmrc = RPMRC_NOTFOUND;
            dbi = NULL;
            requireFlags = NULL;
 /*@-boundsread@*/
@@ -3026,30 +3033,40 @@ memset(data, 0, sizeof(*data));
                if (dbi == NULL)        /* XXX shouldn't happen */
                    continue;
                xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, DB_WRITECURSOR);
+
 key->data = (void *) &hdrNum;
 key->size = sizeof(hdrNum);
 data->data = headerUnload(h);
 data->size = headerSizeof(h, HEADER_MAGIC_NO);
-    if (data->data != NULL) {
+
+               /* Check header digest/signature on blob export. */
+               if (hdrchk && ts) {
+                   const char * msg = NULL;
+                   int lvl;
+
+                   rpmrc = (*hdrchk) (ts, data->data, data->size, &msg);
+                   lvl = (rpmrc == RPMRC_FAIL ? RPMMESS_ERROR : RPMMESS_DEBUG);
+                   rpmMessage(lvl, "%s h#%8u %s",
+                       (rpmrc == RPMRC_FAIL ? _("rpmdb: skipping") : "  +++"),
+                               hdrNum, (msg ? msg : "\n"));
+                   msg = _free(msg);
+               }
+
+               if (data->data != NULL && rpmrc != RPMRC_FAIL) {
 /*@-compmempass@*/
-       xx = dbiPut(dbi, dbcursor, key, data, DB_KEYLAST);
+                   xx = dbiPut(dbi, dbcursor, key, data, DB_KEYLAST);
 /*@=compmempass@*/
-       xx = dbiSync(dbi, 0);
-    }
+                   xx = dbiSync(dbi, 0);
+               }
 data->data = _free(data->data);
 data->size = 0;
                xx = dbiCclose(dbi, dbcursor, DB_WRITECURSOR);
                dbcursor = NULL;
                if (!dbi->dbi_no_dbsync)
                    xx = dbiSync(dbi, 0);
-               {   const char *n, *v, *r;
-                   xx = headerNVR(h, &n, &v, &r);
-                   rpmMessage(RPMMESS_DEBUG, "  +++ %10u %s-%s-%s\n", hdrNum, n, v, r);
-               }
                continue;
                /*@notreached@*/ /*@switchbreak@*/ break;
-           /* XXX preserve legacy behavior */
-           case RPMTAG_BASENAMES:
+           case RPMTAG_BASENAMES:      /* XXX preserve legacy behavior */
                rpmtype = bnt;
                rpmvals = baseNames;
                rpmcnt = count;