summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--convertdb.c2
-rw-r--r--lib/package.c380
-rw-r--r--lib/poptI.c2
-rw-r--r--lib/poptQV.c12
-rw-r--r--lib/psm.c4
-rw-r--r--lib/query.c10
-rw-r--r--lib/rpmchecksig.c2
-rw-r--r--lib/rpmcli.h8
-rw-r--r--lib/rpminstall.c22
-rw-r--r--lib/rpmlib.h21
-rw-r--r--lib/rpmts.c29
-rw-r--r--lib/rpmts.h29
-rw-r--r--lib/verify.c20
-rw-r--r--macros.in32
-rw-r--r--po/cs.po263
-rw-r--r--po/da.po265
-rw-r--r--po/de.po264
-rw-r--r--po/en_RN.po262
-rw-r--r--po/es.po262
-rw-r--r--po/eu_ES.po262
-rw-r--r--po/fi.po263
-rw-r--r--po/fr.po262
-rw-r--r--po/gl.po262
-rw-r--r--po/hu.po262
-rw-r--r--po/id.po262
-rw-r--r--po/is.po265
-rw-r--r--po/it.po262
-rw-r--r--po/ja.po263
-rw-r--r--po/ko.po267
-rw-r--r--po/no.po265
-rw-r--r--po/pl.po263
-rw-r--r--po/pt.po267
-rw-r--r--po/pt_BR.po264
-rw-r--r--po/ro.po262
-rw-r--r--po/rpm.pot262
-rw-r--r--po/ru.po267
-rw-r--r--po/sk.po263
-rw-r--r--po/sl.po265
-rw-r--r--po/sr.po263
-rw-r--r--po/sv.po267
-rw-r--r--po/tr.po267
-rw-r--r--po/uk.po262
-rw-r--r--po/wa.po262
-rw-r--r--po/zh.po262
-rw-r--r--po/zh_CN.GB2312.po262
-rw-r--r--popt/poptint.h8
-rw-r--r--python/rpmdb-py.c7
-rw-r--r--rpm.spec.in8
-rw-r--r--rpmdb/rpmdb.c161
-rw-r--r--rpmdb/rpmdb.h49
-rw-r--r--rpmio/rpmio_internal.h4
-rw-r--r--rpmio/rpmpgp.c20
-rwxr-xr-xrpmqv.c10
-rw-r--r--tools/Makefile.am9
-rw-r--r--tools/rpmcache.c2
56 files changed, 5169 insertions, 3853 deletions
diff --git a/CHANGES b/CHANGES
index 2f6a1a11e..52f805271 100644
--- a/CHANGES
+++ b/CHANGES
@@ -176,6 +176,8 @@
- version added to *.la dependency libraries (#69063).
- expose digests in rpmio API, but hide internal beecrypt API (#68999).
- add methods to make signature handling opaque wrto rpmts.
+ - verify signatures/digests retrieved through rpmdbNextIterator().
+ - imbue %ghost with missingok attribute with --verify (#68933).
4.0.3 -> 4.0.4:
- solaris: translate i86pc to i386 (#57182).
diff --git a/convertdb.c b/convertdb.c
index 929cb2f2d..e266ccd42 100644
--- a/convertdb.c
+++ b/convertdb.c
@@ -185,7 +185,7 @@ int convertDB(void)
free(fileStatesList);
}
- rpmdbAdd(db, dbentry);
+ rpmdbAdd(db, dbentry, NULL, NULL);
free(group);
headerFree(dbentry);
diff --git a/lib/package.c b/lib/package.c
index 5fe74c0fd..c54c5c29f 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -15,6 +15,7 @@
#include "legacy.h" /* XXX providePackageNVR() and compressFileList() */
#include "rpmlead.h"
+#include "header_internal.h" /* XXX headerCheck */
#include "signature.h"
#include "debug.h"
@@ -24,11 +25,73 @@
/*@access pgpDigParams @*/
/*@access rpmts @*/
/*@access Header @*/ /* XXX compared with NULL */
+/*@access entryInfo @*/ /* XXX headerCheck */
+/*@access indexEntry @*/ /* XXX headerCheck */
/*@access FD_t @*/ /* XXX stealing digests */
/*@unchecked@*/
static int _print_pkts = 0;
+/*@unchecked@*/
+static int nkeyids = 0;
+/*@unchecked@*/ /*@only@*/ /*@null@*/
+static int * keyids;
+
+/*@unchecked@*/
+static unsigned char header_magic[8] = {
+ 0x8e, 0xad, 0xe8, 0x01, 0x00, 0x00, 0x00, 0x00
+};
+
+/**
+ * Alignment needs (and sizeof scalars types) for internal rpm data types.
+ */
+/*@observer@*/ /*@unchecked@*/
+static int typeAlign[16] = {
+ 1, /*!< RPM_NULL_TYPE */
+ 1, /*!< RPM_CHAR_TYPE */
+ 1, /*!< RPM_INT8_TYPE */
+ 2, /*!< RPM_INT16_TYPE */
+ 4, /*!< RPM_INT32_TYPE */
+ 8, /*!< RPM_INT64_TYPE */
+ 1, /*!< RPM_STRING_TYPE */
+ 1, /*!< RPM_BIN_TYPE */
+ 1, /*!< RPM_STRING_ARRAY_TYPE */
+ 1, /*!< RPM_I18NSTRING_TYPE */
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0
+};
+
+/**
+ * Sanity check on no. of tags.
+ * This check imposes a limit of 65K tags, more than enough.
+ */
+#define hdrchkTags(_ntags) ((_ntags) & 0xffff0000)
+
+/**
+ * Sanity check on type values.
+ */
+#define hdrchkType(_type) ((_type) < RPM_MIN_TYPE || (_type) > RPM_MAX_TYPE)
+
+/**
+ * Sanity check on data size and/or offset.
+ * This check imposes a limit of 16 MB, more than enough.
+ */
+#define hdrchkData(_nbytes) ((_nbytes) & 0xff000000)
+
+/**
+ * Sanity check on data alignment for data type.
+ */
+#define hdrchkAlign(_type, _off) ((_off) & (typeAlign[_type]-1))
+
+/**
+ * Sanity check on range of data offset.
+ */
+#define hdrchkRange(_dl, _off) ((_off) < 0 || (_off) > (_dl))
+
void headerMergeLegacySigs(Header h, const Header sig)
{
HFD_t hfd = (HFD_t) headerFreeData;
@@ -139,11 +202,6 @@ Header headerRegenSigHeader(const Header h)
return sig;
}
-/*@unchecked@*/
-static int nkeyids = 0;
-/*@unchecked@*/ /*@only@*/ /*@null@*/
-static int * keyids;
-
/**
* Remember current key id.
* @param ts transaction set
@@ -183,10 +241,308 @@ static int rpmtsStashKeyid(rpmts ts)
return 0;
}
-/*@unchecked@*/
-static unsigned char header_magic[8] = {
- 0x8e, 0xad, 0xe8, 0x01, 0x00, 0x00, 0x00, 0x00
-};
+/**
+ * Perform simple sanity and range checks on header tag(s).
+ * @param il no. of tags in header
+ * @param dl no. of bytes in header data.
+ * @param pe 1st element in tag array, big-endian
+ * @param info failing (or last) tag element, host-endian
+ * @return -1 on success, otherwise failing tag element index
+ */
+static int headerVerifyInfo(int il, int dl, entryInfo pe, entryInfo info,
+ int negate)
+ /*@modifies info @*/
+{
+ int i;
+
+/*@-boundsread@*/
+ for (i = 0; i < il; i++) {
+ info->tag = ntohl(pe[i].tag);
+ info->type = ntohl(pe[i].type);
+ info->offset = ntohl(pe[i].offset);
+ if (negate)
+ info->offset = -info->offset;
+ info->count = ntohl(pe[i].count);
+
+ if (hdrchkType(info->type) || hdrchkAlign(info->type, info->offset) ||
+ hdrchkRange(dl, info->offset) || hdrchkData(info->count))
+ return i;
+ }
+/*@=boundsread@*/
+ return -1;
+}
+
+/**
+ * Check header consistency, performing headerGetEntry() the hard way.
+ *
+ * Sanity checks on the header are performed while looking for a
+ * header-only digest or signature to verify the blob. If found,
+ * the digest or signature is verified.
+ *
+ * @param ts transaction set
+ * @param uh unloaded header blob
+ * @param uc no. of bytes in blob (or 0 to disable)
+ * @retval *msg signature verification msg
+ * @return RPMRC_OK/RPMRC_NOTFOUND/RPMRC_FAIL
+ */
+rpmRC headerCheck(rpmts ts, const void * uh, size_t uc, const char ** msg)
+{
+ pgpDig dig;
+ unsigned char buf[8*BUFSIZ];
+ int_32 * ei = (int_32 *) uh;
+/*@-boundsread@*/
+ int_32 il = ntohl(ei[0]);
+ int_32 dl = ntohl(ei[1]);
+ entryInfo pe = (entryInfo) &ei[2];
+/*@=boundsread@*/
+ int_32 ildl[2];
+ int_32 pvlen = sizeof(ildl) + (il * sizeof(*pe)) + dl;
+ unsigned char * dataStart = (char *) (pe + il);
+ indexEntry entry = memset(alloca(sizeof(*entry)), 0, sizeof(*entry));
+ entryInfo info = memset(alloca(sizeof(*info)), 0, sizeof(*info));
+ const void * sig = NULL;
+ const char * b;
+ int vsflags = rpmtsVerifySigFlags(ts);
+ int siglen = 0;
+ int blen;
+ size_t nb;
+ int_32 ril = 0;
+ unsigned char * end = NULL;
+ rpmRC rc = RPMRC_FAIL; /* assume failure */
+ int xx;
+ int i;
+
+ /* Is the blob the right size? */
+ if (uc > 0 && pvlen != uc)
+ goto exit;
+
+ /* Check (and convert) the 1st tag element. */
+ if (headerVerifyInfo(1, dl, pe, &entry->info, 0) != -1)
+ goto exit;
+
+ /* Is there an immutable header region tag? */
+/*@-sizeoftype@*/
+ if (!(entry->info.tag == RPMTAG_HEADERIMMUTABLE
+ && entry->info.type == RPM_BIN_TYPE
+ && entry->info.count == REGION_TAG_COUNT))
+ {
+ rc = RPMRC_NOTFOUND;
+ goto exit;
+ }
+/*@=sizeoftype@*/
+
+ /* Is there an immutable header region tag trailer? */
+ end = dataStart + entry->info.offset;
+/*@-bounds@*/
+ (void) memcpy(info, end, entry->info.count);
+/*@=bounds@*/
+ end += entry->info.count;
+
+/*@-sizeoftype@*/
+ if (headerVerifyInfo(1, dl, info, &entry->info, 1) != -1
+ || !(entry->info.tag == RPMTAG_HEADERIMMUTABLE
+ && entry->info.type == RPM_BIN_TYPE
+ && entry->info.count == REGION_TAG_COUNT))
+ goto exit;
+/*@=sizeoftype@*/
+/*@-boundswrite@*/
+ memset(info, 0, sizeof(*info));
+/*@=boundswrite@*/
+
+ /* Is the no. of tags in the region less than the total no. of tags? */
+ ril = entry->info.offset/sizeof(*pe);
+ if (ril > il)
+ goto exit;
+
+ /* Find a header-only digest/signature tag. */
+ for (i = ril; i < il; i++) {
+ if (headerVerifyInfo(1, dl, pe+i, &entry->info, 0) != -1)
+ goto exit;
+
+ switch (entry->info.tag) {
+ case RPMTAG_SHA1HEADER:
+ if (vsflags & _RPMTS_VSF_NODIGESTS)
+ /*@switchbreak@*/ break;
+ blen = 0;
+/*@-boundsread@*/
+ for (b = dataStart + entry->info.offset; *b != '\0'; b++) {
+ if (strchr("0123456789abcdefABCDEF", *b) == NULL)
+ /*@innerbreak@*/ break;
+ blen++;
+ }
+ if (entry->info.type != RPM_STRING_TYPE || *b != '\0' || blen != 40)
+ goto exit;
+/*@=boundsread@*/
+ if (info->tag == 0) {
+/*@-boundswrite@*/
+ *info = entry->info; /* structure assignment */
+/*@=boundswrite@*/
+ siglen = blen + 1;
+ }
+ /*@switchbreak@*/ break;
+#ifdef NOTYET
+ case RPMTAG_RSAHEADER:
+#endif
+ case RPMTAG_DSAHEADER:
+ if (vsflags & _RPMTS_VSF_NOSIGNATURES)
+ /*@switchbreak@*/ break;
+ if (entry->info.type != RPM_BIN_TYPE)
+ goto exit;
+/*@-boundswrite@*/
+ *info = entry->info; /* structure assignment */
+/*@=boundswrite@*/
+ siglen = info->count;
+ /*@switchbreak@*/ break;
+ default:
+ /*@switchbreak@*/ break;
+ }
+ }
+ rc = RPMRC_NOTFOUND;
+
+exit:
+ /* Return determined RPMRC_OK/RPMRC_FAIL conditions. */
+ if (rc != RPMRC_NOTFOUND)
+ return rc;
+
+ /* If no header-only digest/signature, then do simple sanity check. */
+ if (info->tag == 0) {
+verifyinfo_exit:
+ if (headerVerifyInfo(ril-1, dl, pe+1, &entry->info, 0) != -1)
+ rc = RPMRC_FAIL;
+ else
+ rc = RPMRC_OK;
+ return rc;
+ }
+
+ /* Verify header-only digest/signature. */
+ dig = rpmtsDig(ts);
+ if (dig == NULL)
+ goto verifyinfo_exit;
+ dig->nbytes = 0;
+
+/*@-boundsread@*/
+ sig = memcpy(xmalloc(siglen), dataStart + info->offset, siglen);
+/*@=boundsread@*/
+ (void) rpmtsSetSig(ts, info->tag, info->type, sig, info->count);
+
+ switch (info->tag) {
+#ifdef NOTYET
+ case RPMTAG_RSAHEADER:
+ /* Parse the parameters from the OpenPGP packets that will be needed. */
+ xx = pgpPrtPkts(sig, info->count, dig, (_print_pkts & rpmIsDebug()));
+ /* XXX only V3 signatures for now. */
+ if (dig->signature.version != 3) {
+ rpmMessage(RPMMESS_WARNING,
+ _("only V3 signatures can be verified, skipping V%u signature"),
+ dig->signature.version);
+ rpmtsCleanDig(ts);
+ goto verifyinfo_exit;
+ }
+
+ ildl[0] = htonl(ril);
+ ildl[1] = (end - dataStart);
+ ildl[1] = htonl(ildl[1]);
+
+ dig->hdrmd5ctx = rpmDigestInit(PGPHASHALGO_MD5, RPMDIGEST_NONE);
+
+ b = (unsigned char *) header_magic;
+ nb = sizeof(header_magic);
+ (void) rpmDigestUpdate(dig->hdrmd5ctx, b, nb);
+ dig->nbytes += nb;
+
+ b = (unsigned char *) ildl;
+ nb = sizeof(ildl);
+ (void) rpmDigestUpdate(dig->hdrmd5ctx, b, nb);
+ dig->nbytes += nb;
+
+ b = (unsigned char *) pe;
+ nb = (htonl(ildl[0]) * sizeof(*pe));
+ (void) rpmDigestUpdate(dig->hdrmd5ctx, b, nb);
+ dig->nbytes += nb;
+
+ b = (unsigned char *) dataStart;
+ nb = htonl(ildl[1]);
+ (void) rpmDigestUpdate(dig->hdrmd5ctx, b, nb);
+ dig->nbytes += nb;
+
+ break;
+#endif
+ case RPMTAG_DSAHEADER:
+ /* Parse the parameters from the OpenPGP packets that will be needed. */
+ xx = pgpPrtPkts(sig, info->count, dig, (_print_pkts & rpmIsDebug()));
+ /* XXX only V3 signatures for now. */
+ if (dig->signature.version != 3) {
+ rpmMessage(RPMMESS_WARNING,
+ _("only V3 signatures can be verified, skipping V%u signature"),
+ dig->signature.version);
+ rpmtsCleanDig(ts);
+ goto verifyinfo_exit;
+ }
+ /*@fallthrough@*/
+ case RPMTAG_SHA1HEADER:
+/*@-boundswrite@*/
+ ildl[0] = htonl(ril);
+ ildl[1] = (end - dataStart);
+ ildl[1] = htonl(ildl[1]);
+/*@=boundswrite@*/
+
+ dig->hdrsha1ctx = rpmDigestInit(PGPHASHALGO_SHA1, RPMDIGEST_NONE);
+
+ b = (unsigned char *) header_magic;
+ nb = sizeof(header_magic);
+ (void) rpmDigestUpdate(dig->hdrsha1ctx, b, nb);
+ dig->nbytes += nb;
+
+ b = (unsigned char *) ildl;
+ nb = sizeof(ildl);
+ (void) rpmDigestUpdate(dig->hdrsha1ctx, b, nb);
+ dig->nbytes += nb;
+
+ b = (unsigned char *) pe;
+ nb = (htonl(ildl[0]) * sizeof(*pe));
+ (void) rpmDigestUpdate(dig->hdrsha1ctx, b, nb);
+ dig->nbytes += nb;
+
+ b = (unsigned char *) dataStart;
+ nb = htonl(ildl[1]);
+ (void) rpmDigestUpdate(dig->hdrsha1ctx, b, nb);
+ dig->nbytes += nb;
+
+ break;
+ default:
+ break;
+ }
+
+/** @todo Implement disable/enable/warn/error/anal policy. */
+
+/*@-boundswrite@*/
+ buf[0] = '\0';
+/*@=boundswrite@*/
+ switch (rpmVerifySignature(ts, buf)) {
+ case RPMSIG_OK: /* Signature is OK. */
+ rc = RPMRC_OK;
+ break;
+ case RPMSIG_NOTTRUSTED: /* Signature is OK, but key is not trusted. */
+ case RPMSIG_NOKEY: /* Key is unavailable. */
+ rc = RPMRC_OK;
+ break;
+ case RPMSIG_UNKNOWN: /* Signature is unknown type. */
+ rc = RPMRC_OK;
+ break;
+ default:
+ case RPMSIG_BAD: /* Signature does not verify. */
+ rc = RPMRC_FAIL;
+ break;
+ }
+
+/*@-boundswrite@*/
+ if (msg != NULL)
+ *msg = xstrdup(buf);
+/*@=boundswrite@*/
+
+ rpmtsCleanDig(ts);
+ return rc;
+}
int rpmReadPackageFile(rpmts ts, FD_t fd,
const char * fn, Header * hdrp)
@@ -332,8 +688,7 @@ int rpmReadPackageFile(rpmts ts, FD_t fd,
switch (sigtag) {
case RPMSIGTAG_RSA:
/* Parse the parameters from the OpenPGP packets that will be needed. */
- xx = pgpPrtPkts(sig, siglen, dig,
- (_print_pkts & rpmIsDebug()));
+ xx = pgpPrtPkts(sig, siglen, dig, (_print_pkts & rpmIsDebug()));
/* XXX only V3 signatures for now. */
if (dig->signature.version != 3) {
rpmMessage(RPMMESS_WARNING,
@@ -357,8 +712,7 @@ int rpmReadPackageFile(rpmts ts, FD_t fd,
} break;
case RPMSIGTAG_DSA:
/* Parse the parameters from the OpenPGP packets that will be needed. */
- xx = pgpPrtPkts(sig, siglen, dig,
- (_print_pkts & rpmIsDebug()));
+ xx = pgpPrtPkts(sig, siglen, dig, (_print_pkts & rpmIsDebug()));
/* XXX only V3 signatures for now. */
if (dig->signature.version != 3) {
rpmMessage(RPMMESS_WARNING,
diff --git a/lib/poptI.c b/lib/poptI.c
index ecf82adc7..50c4da069 100644
--- a/lib/poptI.c
+++ b/lib/poptI.c
@@ -189,6 +189,8 @@ struct poptOption rpmInstallPoptTable[] = {
{ "nodigest", '\0', POPT_BIT_SET, &rpmIArgs.qva_flags, VERIFY_DIGEST,
N_("don't verify package digest(s)"), NULL },
+ { "nohdrchk", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, &rpmIArgs.qva_flags, VERIFY_HDRCHK,
+ N_("don't verify database header(s) when retrieved"), NULL },
{ "nosignature", '\0', POPT_BIT_SET, &rpmIArgs.qva_flags, VERIFY_SIGNATURE,
N_("don't verify package signature(s)"), NULL },
diff --git a/lib/poptQV.c b/lib/poptQV.c
index 3b5e25fea..48ed031d0 100644
--- a/lib/poptQV.c
+++ b/lib/poptQV.c
@@ -224,12 +224,6 @@ struct poptOption rpmQueryPoptTable[] = {
* Verify mode options.
*/
struct poptOption rpmVerifyPoptTable[] = {
-#ifdef DYING
-/*@-type@*/ /* FIX: cast? */
- { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA,
- verifyArgCallback, 0, NULL, NULL },
-/*@=type@*/
-#endif /* DYING */
{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmQVSourcePoptTable, 0,
NULL, NULL },
@@ -272,6 +266,9 @@ struct poptOption rpmVerifyPoptTable[] = {
{ "nodigest", '\0', POPT_BIT_SET,
&rpmQVKArgs.qva_flags, VERIFY_DIGEST,
N_("don't verify package digest(s)"), NULL },
+ { "nohdrchk", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
+ &rpmQVKArgs.qva_flags, VERIFY_HDRCHK,
+ N_("don't verify database header(s) when retrieved"), NULL },
{ "nosignature", '\0', POPT_BIT_SET,
&rpmQVKArgs.qva_flags, VERIFY_SIGNATURE,
N_("don't verify package signature(s)"), NULL },
@@ -309,6 +306,9 @@ struct poptOption rpmSignPoptTable[] = {
{ "nodigest", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_DIGEST,
N_("don't verify package digest(s)"), NULL },
+ { "nohdrchk", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
+ &rpmQVKArgs.qva_flags, VERIFY_HDRCHK,
+ N_("don't verify database header(s) when retrieved"), NULL },
{ "nosignature", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_SIGNATURE,
N_("don't verify package signature(s)"), NULL },
diff --git a/lib/psm.c b/lib/psm.c
index 669b16e1d..62a0e75bf 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -1841,11 +1841,11 @@ fprintf(stderr, "*** PSM_RDB_LOAD: header #%u not found\n", fi->record);
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);
+ 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);
+ rc = rpmdbRemove(rpmtsGetRdb(ts), rpmtsGetTid(ts), fi->record, NULL, NULL);
break;
default:
diff --git a/lib/query.c b/lib/query.c
index 552b3b0c5..ad823e1f8 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -920,20 +920,22 @@ restart:
int rpmcliQuery(rpmts ts, QVA_t qva, const char ** argv)
{
const char * arg;
- int vsflags;
+ int vsflags, ovsflags;
int ec = 0;
if (qva->qva_showPackage == NULL)
qva->qva_showPackage = showQueryPackage;
- vsflags = 0;
+ vsflags = rpmExpandNumeric("%{_vsflags_query}");
if (qva->qva_flags & VERIFY_DIGEST)
vsflags |= _RPMTS_VSF_NODIGESTS;
if (qva->qva_flags & VERIFY_SIGNATURE)
vsflags |= _RPMTS_VSF_NOSIGNATURES;
+ if (qva->qva_flags & VERIFY_HDRCHK)
+ vsflags |= _RPMTS_VSF_NOHDRCHK;
vsflags |= _RPMTS_VSF_VERIFY_LEGACY;
- (void) rpmtsSetVerifySigFlags(ts, vsflags);
+ ovsflags = rpmtsSetVerifySigFlags(ts, vsflags);
if (qva->qva_source == RPMQV_ALL) {
/*@-nullpass@*/ /* FIX: argv can be NULL, cast to pass argv array */
ec = rpmQueryVerify(qva, ts, (const char *) argv);
@@ -947,7 +949,7 @@ int rpmcliQuery(rpmts ts, QVA_t qva, const char ** argv)
}
/*@=boundsread@*/
}
- (void) rpmtsSetVerifySigFlags(ts, 0);
+ vsflags = rpmtsSetVerifySigFlags(ts, ovsflags);
if (qva->qva_showPackage == showQueryPackage)
qva->qva_showPackage = NULL;
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index c112c83d3..833d102bb 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -540,7 +540,7 @@ static int rpmImportPubkey(const rpmts ts,
#endif
/* Add header to database. */
- xx = rpmdbAdd(rpmtsGetRdb(ts), rpmtsGetTid(ts), h);
+ xx = rpmdbAdd(rpmtsGetRdb(ts), rpmtsGetTid(ts), h, NULL, NULL);
bottom:
/* Clean up. */
diff --git a/lib/rpmcli.h b/lib/rpmcli.h
index 890a8ef40..a54c922fe 100644
--- a/lib/rpmcli.h
+++ b/lib/rpmcli.h
@@ -167,8 +167,8 @@ typedef enum rpmQueryFlags_e {
QUERY_DIGEST = (1 << 19), /*!< verify: from --nodigest */
QUERY_SIGNATURE = (1 << 20), /*!< verify: from --nosignature */
QUERY_PATCHES = (1 << 21), /*!< placeholder (SuSE) */
+ QUERY_HDRCHK = (1 << 22), /*!< verify: from --nohdrchk */
/*@=enummemuse@*/
- /* bit 22 unused */
QUERY_FOR_LIST = (1 << 23), /*!< query: from --list */
QUERY_FOR_STATE = (1 << 24), /*!< query: from --state */
QUERY_FOR_DOCS = (1 << 25), /*!< query: from --docfiles */
@@ -202,8 +202,8 @@ typedef enum rpmVerifyFlags_e {
VERIFY_SCRIPT = (1 << 18), /*!< verify: from --noscripts */
VERIFY_DIGEST = (1 << 19), /*!< verify: from --nodigest */
VERIFY_SIGNATURE = (1 << 20), /*!< verify: from --nosignature */
- VERFIY_PATCHES = (1 << 21), /*!< placeholder (SuSE) */
- /* bit 22 unused */
+ VERIFY_PATCHES = (1 << 21), /*!< placeholder (SuSE) */
+ VERIFY_HDRCHK = (1 << 22), /*!< verify: from --nohdrchk */
/*@-enummemuse@*/
VERIFY_FOR_LIST = (1 << 23), /*!< query: from --list */
VERIFY_FOR_STATE = (1 << 24), /*!< query: from --state */
@@ -219,7 +219,7 @@ typedef enum rpmVerifyFlags_e {
VERIFY_MTIME | VERIFY_MODE | VERIFY_RDEV )
#define VERIFY_ALL \
( VERIFY_ATTRS | VERIFY_FILES | VERIFY_DEPS | VERIFY_SCRIPT | VERIFY_DIGEST |\
- VERIFY_SIGNATURE )
+ VERIFY_SIGNATURE | VERIFY_HDRCHK )
/** \ingroup rpmcli
*/
diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index bbf5c7828..d1e267280 100644
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -229,7 +229,7 @@ int rpmInstall(rpmts ts,
/*@only@*/ /*@null@*/ const char * fileURL = NULL;
int stopInstall = 0;
const char ** av = NULL;
- int vsflags = _RPMTS_VSF_VERIFY_LEGACY;
+ int vsflags, ovsflags;
int ac = 0;
int rc;
int xx;
@@ -243,11 +243,18 @@ int rpmInstall(rpmts ts,
ts->goal = TSM_INSTALL;
+ if (ia->installInterfaceFlags & INSTALL_UPGRADE)
+ vsflags = rpmExpandNumeric("%{_vsflags_erase}");
+ else
+ vsflags = rpmExpandNumeric("%{_vsflags_install}");
if (ia->qva_flags & VERIFY_DIGEST)
vsflags |= _RPMTS_VSF_NODIGESTS;
if (ia->qva_flags & VERIFY_SIGNATURE)
vsflags |= _RPMTS_VSF_NOSIGNATURES;
- xx = rpmtsSetVerifySigFlags(ts, (vsflags & ~_RPMTS_VSF_VERIFY_LEGACY));
+ if (ia->qva_flags & VERIFY_HDRCHK)
+ vsflags |= _RPMTS_VSF_NOHDRCHK;
+ vsflags |= _RPMTS_VSF_VERIFY_LEGACY;
+ ovsflags = rpmtsSetVerifySigFlags(ts, (vsflags & ~_RPMTS_VSF_VERIFY_LEGACY));
{ int notifyFlags;
notifyFlags = ia->installInterfaceFlags | (rpmIsVerbose() ? INSTALL_LABEL : 0 );
@@ -636,10 +643,21 @@ int rpmErase(rpmts ts,
int numFailed = 0;
int stopUninstall = 0;
int numPackages = 0;
+ int vsflags, ovsflags;
rpmps ps;
if (argv == NULL) return 0;
+ vsflags = rpmExpandNumeric("%{_vsflags_erase}");
+ if (ia->qva_flags & VERIFY_DIGEST)
+ vsflags |= _RPMTS_VSF_NODIGESTS;
+ if (ia->qva_flags & VERIFY_SIGNATURE)
+ vsflags |= _RPMTS_VSF_NOSIGNATURES;
+ if (ia->qva_flags & VERIFY_HDRCHK)
+ vsflags |= _RPMTS_VSF_NOHDRCHK;
+ vsflags |= _RPMTS_VSF_VERIFY_LEGACY;
+ ovsflags = rpmtsSetVerifySigFlags(ts, (vsflags & ~_RPMTS_VSF_VERIFY_LEGACY));
+
(void) rpmtsSetFlags(ts, ia->transFlags);
#ifdef NOTYET /* XXX no callbacks on erase yet */
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 6d88c5698..788fc3a21 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -137,6 +137,24 @@ void headerMergeLegacySigs(Header h, const Header sig)
Header headerRegenSigHeader(const Header h)
/*@modifies h @*/;
+/**
+ * Check header consistency, performing headerGetEntry() the hard way.
+ *
+ * Sanity checks on the header are performed while looking for a
+ * header-only digest or signature to verify the blob. If found,
+ * the digest or signature is verified.
+ *
+ * @param ts transaction set
+ * @param uh unloaded header blob
+ * @param uc no. of bytes in blob (or 0 to disable)
+ * @retval *msg signature verification msg
+ * @return RPMRC_OK/RPMRC_NOTFOUND/RPMRC_FAIL
+ */
+rpmRC headerCheck(rpmts ts, const void * uh, size_t uc, const char ** msg)
+ /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
+ /*@modifies ts, *msg, rpmGlobalMacroContext,
+ fileSystem, internalState @*/;
+
/** \ingroup header
* Retrieve file names from header.
* The representation of file names in package headers changed in rpm-4.0.
@@ -831,7 +849,8 @@ typedef /*@abstract@*/ struct fsm_s * FSM_t;
typedef /*@abstract@*/ struct psm_s * PSM_t;
/**
- * Return package header from file handle.
+ * Return package header from file handle, verifying digests/signatures as
+ * available.
* @param ts transaction set
* @param fd file handle
* @param fn file name
diff --git a/lib/rpmts.c b/lib/rpmts.c
index c7bc4a78b..86919ec7e 100644
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -138,12 +138,36 @@ int rpmtsOpenDB(rpmts ts, int dbmode)
return rc;
}
+int rpmtsInitDB(rpmts ts, int dbmode)
+{
+ return rpmdbInit(ts->rootDir, dbmode);
+}
+
+int rpmtsRebuildDB(rpmts ts)
+{
+ int rc;
+ if (!(ts->vsflags & _RPMTS_VSF_NOHDRCHK))
+ rc = rpmdbRebuild(ts->rootDir, ts, headerCheck);
+ else
+ rc = rpmdbRebuild(ts->rootDir, NULL, NULL);
+ return rc;
+}
+
+int rpmtsVerifyDB(rpmts ts)
+{
+ return rpmdbVerify(ts->rootDir);
+}
+
rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag,
const void * keyp, size_t keylen)
{
+ rpmdbMatchIterator mi;
if (ts->rdb == NULL && rpmtsOpenDB(ts, ts->dbmode))
return NULL;
- return rpmdbInitIterator(ts->rdb, rpmtag, keyp, keylen);
+ mi = rpmdbInitIterator(ts->rdb, rpmtag, keyp, keylen);
+ if (mi && !(ts->vsflags & _RPMTS_VSF_NOHDRCHK))
+ (void) rpmdbSetHdrChk(mi, ts, headerCheck);
+ return mi;
}
rpmVerifySignatureReturn rpmtsFindPubkey(rpmts ts)
@@ -171,9 +195,6 @@ rpmVerifySignatureReturn rpmtsFindPubkey(rpmts ts)
ts->pkpktlen = 0;
memset(ts->pksignid, 0, sizeof(ts->pksignid));
- /* Make sure the database is open. */
- (void) rpmtsOpenDB(ts, ts->dbmode);
-
/* Retrieve the pubkey that matches the signature. */
mi = rpmtsInitIterator(ts, RPMTAG_PUBKEYS, sigp->signid, sizeof(sigp->signid));
while ((h = rpmdbNextIterator(mi)) != NULL) {
diff --git a/lib/rpmts.h b/lib/rpmts.h
index 9c8ba720d..abb803325 100644
--- a/lib/rpmts.h
+++ b/lib/rpmts.h
@@ -16,6 +16,7 @@ extern int _ts_debug;
#define _RPMTS_VSF_NODIGESTS (1 << 0)
#define _RPMTS_VSF_NOSIGNATURES (1 << 1)
#define _RPMTS_VSF_VERIFY_LEGACY (1 << 2)
+#define _RPMTS_VSF_NOHDRCHK (1 << 3)
#if defined(_RPMTS_INTERNAL)
@@ -253,6 +254,34 @@ int rpmtsOpenDB(rpmts ts, int dbmode)
/*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/;
/** \ingroup rpmts
+ * Initialize the database used by the transaction.
+ * @deprecated An explicit rpmdbInit() is almost never needed.
+ * @param ts transaction set
+ * @return 0 on success
+ */
+int rpmtsInitDB(rpmts ts, int dbmode)
+ /*@globals fileSystem, internalState @*/
+ /*@modifies ts, fileSystem, internalState @*/;
+
+/** \ingroup rpmts
+ * Rebuild the database used by the transaction.
+ * @param ts transaction set
+ * @return 0 on success
+ */
+int rpmtsRebuildDB(rpmts ts)
+ /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
+ /*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/;
+
+/** \ingroup rpmts
+ * Verify the database used by the transaction.
+ * @param ts transaction set
+ * @return 0 on success
+ */
+int rpmtsVerifyDB(rpmts ts)
+ /*@globals fileSystem, internalState @*/
+ /*@modifies ts, fileSystem, internalState @*/;
+
+/** \ingroup rpmts
* Return transaction database iterator.
* @param ts transaction set
* @param rpmtag rpm tag
diff --git a/lib/verify.c b/lib/verify.c
index 2d58117d8..a528a92a4 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -284,8 +284,14 @@ static int verifyHeader(QVA_t qva, const rpmts ts, rpmfi fi)
rc = rpmVerifyFile(ts, fi, &verifyResult, omitMask);
/*@=boundswrite@*/
if (rc) {
- if (!(fileAttrs & RPMFILE_MISSINGOK) || rpmIsVerbose()) {
- sprintf(te, _("missing %s"), rpmfiFN(fi));
+ if (!(fileAttrs & (RPMFILE_MISSINGOK|RPMFILE_GHOST)) || rpmIsVerbose()) {
+ sprintf(te, _("missing %c %s"),
+ ((fileAttrs & RPMFILE_CONFIG) ? 'c' :
+ (fileAttrs & RPMFILE_DOC) ? 'd' :
+ (fileAttrs & RPMFILE_GHOST) ? 'g' :
+ (fileAttrs & RPMFILE_LICENSE) ? 'l' :
+ (fileAttrs & RPMFILE_README) ? 'r' : ' '),
+ rpmfiFN(fi));
te += strlen(te);
ec = rc;
}
@@ -452,21 +458,23 @@ int showVerifyPackage(QVA_t qva, rpmts ts, Header h)
int rpmcliVerify(rpmts ts, QVA_t qva, const char ** argv)
{
const char * arg;
- int vsflags;
+ int vsflags, ovsflags;
int ec = 0;
if (qva->qva_showPackage == NULL)
qva->qva_showPackage = showVerifyPackage;
/* XXX verify flags are inverted from query. */
- vsflags = 0;
+ vsflags = rpmExpandNumeric("%{_vsflags_verify}");
if (!(qva->qva_flags & VERIFY_DIGEST))
vsflags |= _RPMTS_VSF_NODIGESTS;
if (!(qva->qva_flags & VERIFY_SIGNATURE))
vsflags |= _RPMTS_VSF_NOSIGNATURES;
+ if (!(qva->qva_flags & VERIFY_HDRCHK))
+ vsflags |= _RPMTS_VSF_NOHDRCHK;
vsflags |= _RPMTS_VSF_VERIFY_LEGACY;
- (void) rpmtsSetVerifySigFlags(ts, vsflags);
+ ovsflags = rpmtsSetVerifySigFlags(ts, vsflags);
if (qva->qva_source == RPMQV_ALL) {
/*@-nullpass@*/ /* FIX: argv can be NULL, cast to pass argv array */
ec = rpmQueryVerify(qva, ts, (const char *) argv);
@@ -480,7 +488,7 @@ int rpmcliVerify(rpmts ts, QVA_t qva, const char ** argv)
}
/*@=boundsread@*/
}
- (void) rpmtsSetVerifySigFlags(ts, 0);
+ vsflags = rpmtsSetVerifySigFlags(ts, ovsflags);
if (qva->qva_showPackage == showVerifyPackage)
qva->qva_showPackage = NULL;
diff --git a/macros.in b/macros.in
index b2805b3cc..158ee98d6 100644
--- 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.110 2002/07/20 19:02:41 jbj Exp $
+# $Id: macros.in,v 1.111 2002/07/24 16:21:23 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
@@ -373,7 +373,7 @@
# ht_dupsort +++ (hash only) DB_DUPSORT
#----------------------- rpmdb specific configuration:
# usedbenv (always on) Use db3 environment?
-# verify (always on, db3 only) Verify Packages db after RW close?
+# verify (db3 only) Verify Packages db after RW close?
# lockdbfd (always on for Packages) Use fcntl(2) locking ?
# nofsync Disable fsync(2) call performed after db3 writes?
# temporary Unlink file when closing.
@@ -381,11 +381,11 @@
# XXX Use a CDB database model for concurrent access (under development,
# cursor teardown with signals needs work.)
#%__dbi_other usedbenv create joinenv cdb mpool \
-# mp_mmapsize=8Mb mp_size=512Kb verify
+# mp_mmapsize=8Mb mp_size=512Kb
# XXX Use transactions and logs for rpmdb durability (no clue yet):
#%__dbi_other usedbenv create joinenv mpool txn log \
-# mp_mmapsize=8Mb mp_size=512Kb verify
+# mp_mmapsize=8Mb mp_size=512Kb
%__dbi_cdb create cdb
@@ -433,7 +433,7 @@
%_dbi_tags Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filemd5s:Depends:Pubkeys
# "Packages" should have shared/exclusive fcntl(2) lock using "lockdbfd".
-%_dbi_config_Packages verify %{_dbi_htconfig} lockdbfd
+%_dbi_config_Packages %{_dbi_htconfig} lockdbfd
# "Depends" is a per-transaction cache of known dependency resolutions.
%_dbi_config_Depends %{_dbi_htconfig} temporary private
@@ -536,6 +536,28 @@
# A path (i.e. URL) prefix that is pre-pended to %{_repackage_dir}.
%_repackage_root %{nil}
+# Verify digest/signature flags for various rpm modes:
+# 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
+#
+# The checking overhead is ~10ms per header for digests/signatures;
+# each header from the database is checked only when first encountered.
+#
+# For example, the value 6 (=4+2) disables legacy digest/signature
+# checking, disables signature checking, but attempts digest checking,
+# also when retrieving headers from the database.
+#
+# Note: the %_vsflags_erase applies to --upgrade/--freshen modes as
+# well as --erase.
+#
+%_vsflags_install 8
+%_vsflags_erase 8
+%_vsflags_query 8
+%_vsflags_rebuilddb 0
+%_vsflags_verify 0
+
# Relations between package names that cause dependency loops
# with legacy packages that cannot be fixed. Relations are
# specified as
diff --git a/po/cs.po b/po/cs.po
index 2888b1439..30bebc629 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -115,7 +115,7 @@ msgstr "<pøík>"
msgid "use <dir> as the top level directory"
msgstr "pou¾ít <adr> jako adresáø nejvy¹¹í úrovnì"
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr "<adresáø>"
@@ -402,40 +402,40 @@ msgstr "--sign mù¾e být pou¾it jen pøi sestavování balíèkù"
msgid "exec failed\n"
msgstr "spu¹tìní selhalo\n"
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr "ke znovusestavení nezadány ¾ádné balíèky"
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr "pro sestavení nezadány ¾ádné spec soubory"
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr "pro sestavení nezadány ¾ádné tar soubory"
-#: rpmqv.c:1061
+#: rpmqv.c:1063
#, fuzzy
msgid "no packages given for erase"
msgstr "nezadány ¾ádné balíèky pro instalaci"
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr "nezadány ¾ádné balíèky pro instalaci"
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr "k dotazu nezadány ¾ádné parametry"
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr "pro kontrolu nezadány ¾ádné balíèky"
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr "neoèekávané parametry pro --querytags "
-#: rpmqv.c:1155
+#: rpmqv.c:1157
#, fuzzy
msgid "no arguments given"
msgstr "k dotazu nezadány ¾ádné parametry"
@@ -1621,41 +1621,42 @@ msgstr "nemohu zapsat do %%%s %s\n"
msgid "error creating temporary file %s\n"
msgstr "chyba pøi vytváøení doèasného souboru %s\n"
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead selhalo\n"
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "práce s balíèky verze 1 není podporována touto verzí RPM\n"
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "tato verze RPM podporuje práci s balíèky s verzí <= 4\n"
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, fuzzy, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: readLead selhalo\n"
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead selhalo\n"
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread selhalo: %s\n"
@@ -1753,7 +1754,7 @@ msgstr "zkratka pro --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "aktualizace balíèku jestli¾e je ji¾ nainstalován"
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
msgid "<packagefile>+"
msgstr "<soubor_balíèku>+"
@@ -1818,41 +1819,46 @@ msgstr "nespou¹tìt ¾ádné skripty (jsou-li nìjaké)"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "nespou¹tìt ¾ádné skripty (jsou-li nìjaké)"
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "nekontrolovat závislosti balíèkù"
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "nekontrolovat architekturu balíèku"
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
#, fuzzy
msgid "don't verify package signature(s)"
msgstr "ovìøit podpis v balíèku"
-#: lib/poptI.c:197
+#: lib/poptI.c:199
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "nespou¹tìt ¾ádné skripty aktivované tímto balíèkem"
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "nespou¹tìt ¾ádné skripty urèené pro balíèky"
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "nespou¹tìt ¾ádné instalaèní skripty"
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "nespou¹tìt ¾ádné instalaèní skripty"
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "nespou¹tìt ¾ádné instalaèní skripty"
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1860,48 +1866,48 @@ msgstr ""
"aktualizovat na starou verzi balíèku (--force to dìlá pøi aktualizacích "
"automaticky)"
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr "bìhem instalace balíèku zobrazit procenta"
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr "pøemístit soubory do <adr>, jsou-li pøemístitelné"
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr "pøemístit soubory ze <staré_cesty> do <nové_cesty>"
-#: lib/poptI.c:223
+#: lib/poptI.c:225
msgid "<old>=<new>"
msgstr "<stará_cesta>=<nová_cesta>"
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr "uchovat smazané soubory pomocí pøebalení"
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr "instalovat, i kdy¾ balíèek pøepí¹e existující soubory"
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr "pøeinstalovat, i kdy¾ je ji¾ balíèek pøítomen"
-#: lib/poptI.c:234
+#: lib/poptI.c:236
#, fuzzy
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr "odinstalovat nové balíèky, reinstalovat staré balíèky zpìt do data"
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr "<datum>"
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr "neinstalovat ale sdìlit, zda-li by to fungovalo èi nikoli"
-#: lib/poptI.c:240
+#: lib/poptI.c:242
msgid "upgrade package(s)"
msgstr "aktualizace balíèku"
@@ -2030,77 +2036,77 @@ msgstr "zobrazit stav vypsaných souborù"
msgid "display a verbose file listing"
msgstr "zobrazit roz¹íøený výpis souborù"
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
msgid "don't verify MD5 digest of files"
msgstr "nekontrolovat MD5 souborù v balíèku"
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
msgid "don't verify size of files"
msgstr "nekontrolovat velikost souborù"
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
msgid "don't verify symlink path of files"
msgstr "nekontrolovat cesty symbolických linek"
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
msgid "don't verify owner of files"
msgstr "nekontrolovat vlastníka souborù"
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
msgid "don't verify group of files"
msgstr "nekontrolovat skupinu souborù"
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr "nekontrolovat èas zmìny souboru"
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
msgid "don't verify mode of files"
msgstr "nekontrolovat mód souborù"
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr "nekontrolovat soubory v balíèku"
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr "nekontrolovat závislosti balíèkù"
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "nespou¹tìt %verifyscript (pokud existuje)"
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "nekontrolovat SHA1 digest v hlavièce"
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "nekontrolovat MD5 souborù v balíèku"
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
#, fuzzy
msgid "sign package(s) (identical to --resign)"
msgstr "podepsat balíèek (zahodit aktuální podpis)"
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
#, fuzzy
msgid "verify package signature(s)"
msgstr "ovìøit podpis v balíèku"
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
#, fuzzy
msgid "sign package(s) (identical to --addsign)"
msgstr "podepsat balíèek (zahodit aktuální podpis)"
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
msgid "generate signature"
msgstr "generovat PGP/GPG podpis"
@@ -2173,7 +2179,7 @@ msgstr "nemohu otevøít %s: %s\n"
msgid "%s failed: %s\n"
msgstr "%s selhalo\n"
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr "nesprávný formát: %s\n"
@@ -2222,8 +2228,8 @@ msgstr "balíèek nemá vlastníka souboru ani seznamy id\n"
msgid "can't query %s: %s\n"
msgstr "nemohu provést dotaz %s: %s\n"
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr "otevøení %s selhalo: %s\n"
@@ -2237,7 +2243,7 @@ msgstr "dotaz na %s se nezdaøil\n"
msgid "old format source packages cannot be queried\n"
msgstr "nelze provést dotaz na zdrojové balíèky starého formátu\n"
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "¾ádný balíèek neaktivuje %s\n"
@@ -2306,7 +2312,7 @@ msgstr "záznam balíèku èíslo: %u\n"
msgid "record %u could not be read\n"
msgstr "záznam %u nelze pøeèíst\n"
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr "balíèek %s není nainstalován\n"
@@ -2483,84 +2489,84 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "nezadány ¾ádné balíèky pro instalaci"
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, fuzzy, c-format
msgid "Retrieving %s\n"
msgstr "RPM verze %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, fuzzy, c-format
msgid " ... as %s\n"
msgstr "%s ulo¾eno jako %s\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "cesta %s v balíèku %s není pøemístitelná"
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "chyba pøi vytváøení doèasného souboru %s\n"
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "neinstalován "
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "vytvoøení zdrojového a binárního balíèku z <tar_soubor>"
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "chybné závislosti pøi sestavování:\n"
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
#, fuzzy
msgid "installing binary packages\n"
msgstr "nainstalovat balíèek"
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "nemohu vytvoøit %s: %s\n"
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, fuzzy, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "Polo¾ka %s musí být v balíèku pøítomna: %s\n"
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "nemohu vytvoøit %s: %s\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, fuzzy, c-format
msgid "Installing %s\n"
msgstr "øádek: %s\n"
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2777,13 +2783,13 @@ msgstr "Nemohu otevøít %s: %s\n"
msgid "cannot open Packages database in %s\n"
msgstr "nemohu otevøít RPM databázi v %s\n"
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, fuzzy, c-format
msgid "cannot open Solve database in %s\n"
msgstr "nemohu otevøít RPM databázi v %s\n"
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr "získávám seznam pøipojených systémù souborù\n"
@@ -2996,10 +3002,10 @@ msgstr ""
#: lib/verify.c:288
#, fuzzy, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr "chybí { po %"
-#: lib/verify.c:389
+#: lib/verify.c:395
#, fuzzy, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr "chybné závislosti pøi sestavování:\n"
@@ -3177,164 +3183,179 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr "generovat hlavièky balíèkù kompatibilní s RPM verze 2 a 3"
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, fuzzy, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "nemohu otevøít RPM databázi v %s\n"
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, fuzzy, c-format
msgid "cannot open %s index\n"
msgstr "nemohu otevøít RPM databázi v %s\n"
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, 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:2033
+#: rpmdb/rpmdb.c:2127
+#, c-format
+msgid "h#%6u: already checked.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2136
+#, fuzzy, c-format
+msgid "h#%6u: %s"
+msgstr "%s: %s\n"
+
+#: rpmdb/rpmdb.c:2142
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "rpmdb: header #%u: %s -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2365
+#: rpmdb/rpmdb.c:2500
#, 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:2480
+#: rpmdb/rpmdb.c:2615
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n"
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, 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:2512
+#: rpmdb/rpmdb.c:2647
#, 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:2533
+#: rpmdb/rpmdb.c:2668
#, 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:2543
+#: rpmdb/rpmdb.c:2678
#, 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:2690
+#: rpmdb/rpmdb.c:2827
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "znovu vytvoøit databázi z existující databáze"
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "chyba pøi vytváøení doèasného souboru %s\n"
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "nemohu provést dotaz %s: %s\n"
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "Nelze pøejmenovat %s na %s: %m\n"
diff --git a/po/da.po b/po/da.po
index 5725dc1fa..abeaf136e 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -116,7 +116,7 @@ msgstr "<kmd>"
msgid "use <dir> as the top level directory"
msgstr "brug <katalog> som topniveau-katalog"
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr "<katalog>"
@@ -397,40 +397,40 @@ msgstr "--sign kan kun bruges ved pakkeopbygning"
msgid "exec failed\n"
msgstr "eksekvering mislykkedes\n"
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr "ingen pakkefiler angivet til genopbygning"
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr "ingen spec-fil angivet til opbygning"
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr "ingen tar-arkiver angivet til opbygning"
-#: rpmqv.c:1061
+#: rpmqv.c:1063
#, fuzzy
msgid "no packages given for erase"
msgstr "ingen pakker angivet ved installation"
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr "ingen pakker angivet ved installation"
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr "ingen parametre angivet ved forespørgsel"
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr "ingen parametre angivet ved verifikation"
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr "uventede parametre til --querytags "
-#: rpmqv.c:1155
+#: rpmqv.c:1157
#, fuzzy
msgid "no arguments given"
msgstr "ingen parametre angivet ved forespørgsel"
@@ -1619,42 +1619,43 @@ msgstr "kunne ikke skrive til %s\n"
msgid "error creating temporary file %s\n"
msgstr "fejl ved oprettelse af midlertidig fil %s\n"
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead mislykkedes\n"
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "indpakningsversion 1 understøttes ikke af denne udgave af RPM\n"
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
"kun indpakninger med hovedversion <= 4 understøttes af denne udgave af RPM\n"
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature mislykkedes\n"
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen tilgængelig signatur\n"
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead mislykkedes\n"
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread mislykkedes: %s\n"
@@ -1755,7 +1756,7 @@ msgstr "forkortelse for --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "opgradér pakke, hvis den allerede er installeret"
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
msgid "<packagefile>+"
msgstr "<pakkefil>+"
@@ -1821,42 +1822,47 @@ msgstr "udfør ikke eventuelle skripter"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "udfør ikke eventuelle skripter"
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "undlad at tjekke pakkers afhængighedskrav"
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "tjek ikke pakkens arkitektur"
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
#, fuzzy
msgid "don't verify package signature(s)"
msgstr "verificér pakkesignatur"
-#: lib/poptI.c:197
+#: lib/poptI.c:199
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "udfør ikke småskripter, der måtte udløses af denne pakke"
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "udfør ingen pakkespecifikke skripter"
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "udfør ingen installations-småskripter"
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "udfør ingen installations-småskripter"
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "udfør ingen installations-småskripter"
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1864,49 +1870,49 @@ msgstr ""
"opgradér til en ældre version af pakken (--force gør ikke dette automatisk "
"ved opgraderinger)"
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr "vis procenter efterhånden som pakken installeres"
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr "omdirigér pakken til <katalog>, hvis omdirigérbar"
-#: lib/poptI.c:222
+#: lib/poptI.c:224
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "omdirigér filer fra <gammelsti> til <nysti>"
-#: lib/poptI.c:223
+#: lib/poptI.c:225
#, fuzzy
msgid "<old>=<new>"
msgstr "<gammelsti>=<nysti>"
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr "intallér selvom pakken erstatter installerede filer"
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr "geninstallér hvis pakken allerede er installeret"
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr "installér ikke, men fortæl om det ville lykkes eller ej"
-#: lib/poptI.c:240
+#: lib/poptI.c:242
#, fuzzy
msgid "upgrade package(s)"
msgstr "opgradér pakke"
@@ -2036,84 +2042,84 @@ msgstr "vis filernes status"
msgid "display a verbose file listing"
msgstr "giv en detaljeret filliste"
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
#, fuzzy
msgid "don't verify MD5 digest of files"
msgstr "verificér ikke filerne i pakke"
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
#, fuzzy
msgid "don't verify size of files"
msgstr "verificér ikke filerne i pakke"
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
#, fuzzy
msgid "don't verify symlink path of files"
msgstr "verificér ikke filerne i pakke"
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
#, fuzzy
msgid "don't verify owner of files"
msgstr "verificér ikke filerne i pakke"
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
#, fuzzy
msgid "don't verify group of files"
msgstr "verificér ikke filerne i pakke"
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
#, fuzzy
msgid "don't verify mode of files"
msgstr "verificér ikke filerne i pakke"
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr "verificér ikke filerne i pakke"
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
#, fuzzy
msgid "don't verify package dependencies"
msgstr "undlad at tjekke pakkers afhængighedskrav"
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "udfør ikke eventuelt %verifyscript"
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "verificér ikke filerne i pakke"
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "verificér ikke filerne i pakke"
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
#, fuzzy
msgid "sign package(s) (identical to --resign)"
msgstr "underskriv en pakke (slet nuværende signatur)"
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
#, fuzzy
msgid "verify package signature(s)"
msgstr "verificér pakkesignatur"
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
#, fuzzy
msgid "sign package(s) (identical to --addsign)"
msgstr "underskriv en pakke (slet nuværende signatur)"
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
#, fuzzy
msgid "generate signature"
msgstr "generér PGP/GPG-signatur"
@@ -2189,7 +2195,7 @@ msgstr "kunne ikke åbne %s: %s\n"
msgid "%s failed: %s\n"
msgstr "%s mislykkedes\n"
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr "ugyldigt format: %s\n"
@@ -2238,8 +2244,8 @@ msgstr "pakke har hverken filejerskabs- eller id-lister\n"
msgid "can't query %s: %s\n"
msgstr "kunne ikke forespørge %s: %s\n"
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr "åbning af %s mislykkedes %s\n"
@@ -2253,7 +2259,7 @@ msgstr "forespørgsel af %s mislykkedes\n"
msgid "old format source packages cannot be queried\n"
msgstr "pakke med gammelt kildeformat kan ikke forespørges\n"
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "ingen pakker udløser %s\n"
@@ -2322,7 +2328,7 @@ msgstr "pakkens post-nummer: %u\n"
msgid "record %u could not be read\n"
msgstr "post %d kunne ikke læses\n"
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr "pakken %s er ikke installeret\n"
@@ -2497,83 +2503,83 @@ msgstr "Forbereder..."
msgid "Preparing packages for installation..."
msgstr "Forbereder pakker til installation..."
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr "Modtager %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr " ... som %s\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "overspringer %s - overførsel mislykkedes - %s\n"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr "pakke %s kan ikke omrokeres\n"
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr "fejl ved læsning fra filen %s\n"
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "filen %s kræver en nyere version af RPM\n"
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s kunne ikke installeres\n"
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "fandt %d kilde- og %d binærpakker\n"
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "afhængighedskrav, der ikke kunne imødekommes:\n"
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr "installerer binærpakker\n"
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "kunne ikke åbne fil %s: %s\n"
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" angiver flere pakker\n"
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kunne ikke åbne %s: %s\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr "Installerer %s\n"
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2793,13 +2799,13 @@ msgstr "Kunne ikke åbne %s for læsning: %s.\n"
msgid "cannot open Packages database in %s\n"
msgstr "kunne ikke åbne Packages-database i %s\n"
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, fuzzy, c-format
msgid "cannot open Solve database in %s\n"
msgstr "kan ikke åbne rpm-database i %s\n"
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr "henter liste over monterede filsystemer\n"
@@ -3004,11 +3010,11 @@ msgid "install/erase %d elements\n"
msgstr ""
#: lib/verify.c:288
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+msgid "missing %c %s"
msgstr "manglende %s"
-#: lib/verify.c:389
+#: lib/verify.c:395
#, fuzzy, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr "Ikke-tilfredsstillede afhængighedskrav for %s-%s-%s: "
@@ -3186,168 +3192,183 @@ msgstr ""
"generér hoveder, der er kompatible med (gamle) rpm[23]-indpakningsversioner"
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: ukendt mærkenavn: \"%s\" ignoreret\n"
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "kan ikke åbne '%s'-indeks ved brug af db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, c-format
msgid "cannot open %s index\n"
msgstr "kan ikke åbne '%s'-indeks\n"
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr "der er ikke sat nogen dbpath\n"
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, 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:1449
+#: rpmdb/rpmdb.c:1527
#, 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:2033
+#: rpmdb/rpmdb.c:2127
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "h#%6u: already checked.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2136
+#, fuzzy, c-format
+msgid "h#%6u: %s"
+msgstr "fil %s: %s\n"
+
+#: rpmdb/rpmdb.c:2142
+#, c-format
+msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, 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:2365
+#: rpmdb/rpmdb.c:2500
#, 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:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "fjerner \"%s\" fra %s-indekset.\n"
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "fjerne %d indgange fra %s-indekset.\n"
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, 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:2533
+#: rpmdb/rpmdb.c:2668
#, 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:2543
+#: rpmdb/rpmdb.c:2678
#, 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:2690
+#: rpmdb/rpmdb.c:2827
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "fejl(%d) under allokering af ny pakkeinstans\n"
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
"tilføjer \"%s\" til '%s'-indekset.\n"
"\n"
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "tilføjer %d indgange til '%s'-indekset.\n"
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, 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:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "fjerner %s efter vellykket genopbygning af db3.\n"
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr "der ikke sat nogen dbpath"
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "genopbygger database %s over i %s\n"
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr "den midlertidige database %s eksisterer allerede\n"
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, c-format
msgid "creating directory %s\n"
msgstr ""
"opretter kataloget %s\n"
"\n"
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, c-format
msgid "creating directory %s: %s\n"
msgstr "opretter kataloget %s: %s\n"
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "åbner gammel database med dbapi %d\n"
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "åbner ny database med dbapi %d\n"
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, fuzzy, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr "post nummer %d i databasen er fejlbehæftet -- overspringer.\n"
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, 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:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr "kunne ikke genopbygge database: original-databasen beholdes\n"
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr "kunne ikke erstatte gammel database med ny database!\n"
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, 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:3502
+#: rpmdb/rpmdb.c:3643
#, c-format
msgid "removing directory %s\n"
msgstr "fjerner kataloget %s\n"
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "kunne ikke fjerne katalog %s: %s\n"
diff --git a/po/de.po b/po/de.po
index 2fe4b95a9..9636cea6c 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -157,7 +157,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "<VERZ> als Stammverzeichnis benutzen"
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -461,40 +461,40 @@ msgstr "--sign darf nur während der Paketerstellung benutzt werden"
msgid "exec failed\n"
msgstr "%s: Öffnen fehlgeschlagen\n"
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr "Es wurden keine Paketdateien für die Neuerstellung angegeben"
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr "Es wurde kein spec-Datei für die Erstellung angegeben"
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr "Es wurde keine tar-Datei für die Erstellung angegeben"
-#: rpmqv.c:1061
+#: rpmqv.c:1063
#, fuzzy
msgid "no packages given for erase"
msgstr "Es wurden keine Pakete für die Installation angegeben"
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr "Es wurden keine Pakete für die Installation angegeben"
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr "Es wurden keine Argumente für die Anfrage angegeben"
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr "Es wurden keine Argumente für die Überprüfung angegeben"
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr "Unerwartete Argumente zu --querytags "
-#: rpmqv.c:1155
+#: rpmqv.c:1157
#, fuzzy
msgid "no arguments given"
msgstr "Es wurden keine Argumente für die Anfrage angegeben"
@@ -1755,45 +1755,46 @@ msgstr "kann Datei %s nicht öffnen: "
msgid "error creating temporary file %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
-#: lib/package.c:237
+#: lib/package.c:593
#, fuzzy
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
"Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt"
-#: lib/package.c:245
+#: lib/package.c:601
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
"Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt"
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: »rpmReadSignature« fehlgeschlagen\n"
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Keine Signatur verfügbar\n"
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
@@ -1895,7 +1896,7 @@ msgstr "Abkürzung für --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "Paket %s ist nicht installiert\n"
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
#, fuzzy
msgid "<packagefile>+"
msgstr " -b<STUFE> <SPEC> "
@@ -1962,42 +1963,47 @@ msgstr "Keine Stufen ausführen"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "Keine Stufen ausführen"
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "Dateiabhängigkeiten nicht überprüfen"
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "Paket-Architektur nicht überprüfen"
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
#, fuzzy
msgid "don't verify package signature(s)"
msgstr "Paketsignatur überprüfen"
-#: lib/poptI.c:197
+#: lib/poptI.c:199
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "kein Skript ausführen, das durch dieses Paket veranlasst wurde"
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "Keine paketspezifischen Skripte ausführen"
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "Keine Installations-Skripte ausführen"
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "Keine Installations-Skripte ausführen"
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "Keine Installations-Skripte ausführen"
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2005,50 +2011,50 @@ msgstr ""
"Aktualisierung auf eine alte Version des Pakets (--force macht das bei "
"Aktualisierungen automatisch)"
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr "Prozentangabe bei der Paketinstallation ausgeben"
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
"Verschiebe das Paket, wenn es verschiebbar ist, in das Verzeichnis <VERZ>"
-#: lib/poptI.c:222
+#: lib/poptI.c:224
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
-#: lib/poptI.c:223
+#: lib/poptI.c:225
#, fuzzy
msgid "<old>=<new>"
msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr "Auch dann installieren, wenn das Paket installierte Dateien ersetzt"
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr "Neuinstallation, wenn das Paket schon vorhanden ist"
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr "Nicht installieren - nur anzeigen, ob es funktionieren würde"
-#: lib/poptI.c:240
+#: lib/poptI.c:242
#, fuzzy
msgid "upgrade package(s)"
msgstr "Paket installieren"
@@ -2195,85 +2201,85 @@ msgstr ""
msgid "display a verbose file listing"
msgstr "Dateiliste des Pakets anzeigen"
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
#, fuzzy
msgid "don't verify MD5 digest of files"
msgstr "Paket installieren"
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
#, fuzzy
msgid "don't verify size of files"
msgstr "Paket installieren"
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
#, fuzzy
msgid "don't verify symlink path of files"
msgstr "Paket installieren"
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
#, fuzzy
msgid "don't verify owner of files"
msgstr "Paket installieren"
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
#, fuzzy
msgid "don't verify group of files"
msgstr "Paket installieren"
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
#, fuzzy
msgid "don't verify mode of files"
msgstr "Paket installieren"
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
#, fuzzy
msgid "don't verify files in package"
msgstr "Paket installieren"
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
#, fuzzy
msgid "don't verify package dependencies"
msgstr "Dateiabhängigkeiten nicht überprüfen"
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "Keine Stufen ausführen"
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "Paket installieren"
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "Paket installieren"
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
#, fuzzy
msgid "sign package(s) (identical to --resign)"
msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
#, fuzzy
msgid "verify package signature(s)"
msgstr "Paketsignatur überprüfen"
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
#, fuzzy
msgid "sign package(s) (identical to --addsign)"
msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
#, fuzzy
msgid "generate signature"
msgstr "PGP-Signatur generieren"
@@ -2350,7 +2356,7 @@ msgstr "Öffnen von %s fehlgeschlagen: %s"
msgid "%s failed: %s\n"
msgstr "pgp fehlgeschlagen"
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "Fehler beim Format %s\n"
@@ -2401,8 +2407,8 @@ msgstr "Paket hat keinen Namen"
msgid "can't query %s: %s\n"
msgstr "Fehler: kann %s nicht öffnen\n"
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "öffnen von %s fehlgeschlagen: %s\n"
@@ -2416,7 +2422,7 @@ msgstr "Anfrage von %s fehlgeschlagen\n"
msgid "old format source packages cannot be queried\n"
msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n"
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "kein Paket triggert %s\n"
@@ -2489,7 +2495,7 @@ msgstr "ungültige Paket-Nummer: %s\n"
msgid "record %u could not be read\n"
msgstr "Eintrag %d konnte nicht gelesen werden\n"
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr "Paket %s ist nicht installiert\n"
@@ -2668,84 +2674,84 @@ msgid "Preparing packages for installation..."
msgstr "Es wurden keine Pakete für die Installation angegeben"
# , c-format
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr "Hole %s heraus\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "Paket %s ist nicht installiert\n"
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "Fehler: %s kann nicht installiert werden\n"
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n"
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
#, fuzzy
msgid "installing binary packages\n"
msgstr "Paket installieren"
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "kann Datei %s nicht öffnen: "
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" bezeichnet mehrere Pakete\n"
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "Fehler: kann %s nicht öffnen\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr "Installiere %s\n"
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
@@ -2969,13 +2975,13 @@ msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."
msgid "cannot open Packages database in %s\n"
msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, fuzzy, c-format
msgid "cannot open Solve database in %s\n"
msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -3188,10 +3194,10 @@ msgstr ""
#: lib/verify.c:288
#, fuzzy, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr "fehlende { nach %{"
-#: lib/verify.c:389
+#: lib/verify.c:395
#, fuzzy, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: "
@@ -3372,171 +3378,187 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, fuzzy, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "kann Datei %s nicht öffnen: "
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, fuzzy, c-format
msgid "cannot open %s index\n"
msgstr "Fehler: kann %s nicht öffnen\n"
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
#, fuzzy
msgid "no dbpath has been set\n"
msgstr "»dbpath« ist nicht gesetzt"
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "Fehler beim Eintrag %s von %s"
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, fuzzy, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
+#, c-format
+msgid "h#%6u: already checked.\n"
+msgstr ""
+
+# , c-format
+#: rpmdb/rpmdb.c:2136
+#, fuzzy, c-format
+msgid "h#%6u: %s"
+msgstr "Öffnen von %s fehlgeschlagen: %s"
+
+#: rpmdb/rpmdb.c:2142
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "rpmdb: header #%u: %s -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, 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:2365
+#: rpmdb/rpmdb.c:2500
#, 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:2480
+#: rpmdb/rpmdb.c:2615
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
# FIXME
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "Fehler beim Eintrag %s von %s"
-#: rpmdb/rpmdb.c:2533
+#: rpmdb/rpmdb.c:2668
#, 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:2543
+#: rpmdb/rpmdb.c:2678
#, 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:2690
+#: rpmdb/rpmdb.c:2827
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "Fehler beim Suchen nach Paket %s\n"
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
# FIXME
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "Fehler beim Löschen des Eintrags %s nach %s"
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr "»dbpath« ist nicht gesetzt"
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "Datenbank aus der vorhandenen neu erstellen"
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "die temporäre Datenbank %s existiert schon"
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "Datenbank aus der vorhandenen neu erstellen"
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "Datenbank aus der vorhandenen neu erstellen"
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, fuzzy, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+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:3464
+#: rpmdb/rpmdb.c:3605
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d"
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
# , c-format
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s"
diff --git a/po/en_RN.po b/po/en_RN.po
index 43b65b50f..14b69f830 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -392,39 +392,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1063
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1157
msgid "no arguments given"
msgstr ""
@@ -1584,41 +1584,42 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -1711,7 +1712,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
msgid "<packagefile>+"
msgstr ""
@@ -1775,85 +1776,89 @@ msgstr ""
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:199
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:223
+#: lib/poptI.c:225
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:240
+#: lib/poptI.c:242
msgid "upgrade package(s)"
msgstr ""
@@ -1976,71 +1981,71 @@ msgstr ""
msgid "display a verbose file listing"
msgstr ""
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
msgid "don't verify MD5 digest of files"
msgstr ""
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
msgid "don't execute verify script(s)"
msgstr ""
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
msgid "don't verify GPG V3 DSA signature(s)"
msgstr ""
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr ""
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
msgid "sign package(s) (identical to --resign)"
msgstr ""
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
msgid "verify package signature(s)"
msgstr ""
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
msgid "sign package(s) (identical to --addsign)"
msgstr ""
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
msgid "generate signature"
msgstr ""
@@ -2113,7 +2118,7 @@ msgstr ""
msgid "%s failed: %s\n"
msgstr ""
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
@@ -2161,8 +2166,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2176,7 +2181,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2245,7 +2250,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2415,82 +2420,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2706,13 +2711,13 @@ msgstr ""
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, c-format
msgid "cannot open Solve database in %s\n"
msgstr ""
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -2914,10 +2919,10 @@ msgstr ""
#: lib/verify.c:288
#, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:389
+#: lib/verify.c:395
#, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr ""
@@ -3093,164 +3098,179 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr ""
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, c-format
msgid "cannot open %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "h#%6u: already checked.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2136
+#, c-format
+msgid "h#%6u: %s"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2142
+#, c-format
+msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2365
+#: rpmdb/rpmdb.c:2500
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2533
+#: rpmdb/rpmdb.c:2668
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 43b65b50f..14b69f830 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -392,39 +392,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1063
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1157
msgid "no arguments given"
msgstr ""
@@ -1584,41 +1584,42 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -1711,7 +1712,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
msgid "<packagefile>+"
msgstr ""
@@ -1775,85 +1776,89 @@ msgstr ""
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:199
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:223
+#: lib/poptI.c:225
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:240
+#: lib/poptI.c:242
msgid "upgrade package(s)"
msgstr ""
@@ -1976,71 +1981,71 @@ msgstr ""
msgid "display a verbose file listing"
msgstr ""
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
msgid "don't verify MD5 digest of files"
msgstr ""
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
msgid "don't execute verify script(s)"
msgstr ""
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
msgid "don't verify GPG V3 DSA signature(s)"
msgstr ""
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr ""
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
msgid "sign package(s) (identical to --resign)"
msgstr ""
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
msgid "verify package signature(s)"
msgstr ""
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
msgid "sign package(s) (identical to --addsign)"
msgstr ""
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
msgid "generate signature"
msgstr ""
@@ -2113,7 +2118,7 @@ msgstr ""
msgid "%s failed: %s\n"
msgstr ""
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
@@ -2161,8 +2166,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2176,7 +2181,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2245,7 +2250,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2415,82 +2420,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2706,13 +2711,13 @@ msgstr ""
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, c-format
msgid "cannot open Solve database in %s\n"
msgstr ""
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -2914,10 +2919,10 @@ msgstr ""
#: lib/verify.c:288
#, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:389
+#: lib/verify.c:395
#, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr ""
@@ -3093,164 +3098,179 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr ""
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, c-format
msgid "cannot open %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "h#%6u: already checked.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2136
+#, c-format
+msgid "h#%6u: %s"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2142
+#, c-format
+msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2365
+#: rpmdb/rpmdb.c:2500
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2533
+#: rpmdb/rpmdb.c:2668
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 43b65b50f..14b69f830 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -392,39 +392,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1063
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1157
msgid "no arguments given"
msgstr ""
@@ -1584,41 +1584,42 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -1711,7 +1712,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
msgid "<packagefile>+"
msgstr ""
@@ -1775,85 +1776,89 @@ msgstr ""
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:199
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:223
+#: lib/poptI.c:225
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:240
+#: lib/poptI.c:242
msgid "upgrade package(s)"
msgstr ""
@@ -1976,71 +1981,71 @@ msgstr ""
msgid "display a verbose file listing"
msgstr ""
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
msgid "don't verify MD5 digest of files"
msgstr ""
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
msgid "don't execute verify script(s)"
msgstr ""
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
msgid "don't verify GPG V3 DSA signature(s)"
msgstr ""
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr ""
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
msgid "sign package(s) (identical to --resign)"
msgstr ""
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
msgid "verify package signature(s)"
msgstr ""
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
msgid "sign package(s) (identical to --addsign)"
msgstr ""
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
msgid "generate signature"
msgstr ""
@@ -2113,7 +2118,7 @@ msgstr ""
msgid "%s failed: %s\n"
msgstr ""
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
@@ -2161,8 +2166,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2176,7 +2181,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2245,7 +2250,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2415,82 +2420,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2706,13 +2711,13 @@ msgstr ""
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, c-format
msgid "cannot open Solve database in %s\n"
msgstr ""
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -2914,10 +2919,10 @@ msgstr ""
#: lib/verify.c:288
#, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:389
+#: lib/verify.c:395
#, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr ""
@@ -3093,164 +3098,179 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr ""
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, c-format
msgid "cannot open %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "h#%6u: already checked.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2136
+#, c-format
+msgid "h#%6u: %s"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2142
+#, c-format
+msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2365
+#: rpmdb/rpmdb.c:2500
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2533
+#: rpmdb/rpmdb.c:2668
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 6532fb9fc..6c42c3594 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-0400\n"
"Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
"Language-Team: Finnish <linux@sot.com>\n"
"Content-Type: text/plain; charset=\n"
@@ -114,7 +114,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "käytä <hakem> ylimpänä hakemistona"
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -409,40 +409,40 @@ msgstr "--sign: voidaan käyttää vain paketteja käännettäessä"
msgid "exec failed\n"
msgstr "%s: avaus ei onnistunut\n"
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr "uudelleenkäännolle ei määritelty paketteja"
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr "käännökselle ei annettu määrittelytiedostoja"
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr "käännökselle ei määritelty tar-tiedostoja"
-#: rpmqv.c:1061
+#: rpmqv.c:1063
#, fuzzy
msgid "no packages given for erase"
msgstr "asennukselle ei määritelty paketteja"
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr "asennukselle ei määritelty paketteja"
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr "kyselylle ei annettu parametrejä"
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr "tarkistukselle ei annettu parametrejä"
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr "--querytags: odottamattomia parametrejä"
-#: rpmqv.c:1155
+#: rpmqv.c:1157
#, fuzzy
msgid "no arguments given"
msgstr "kyselylle ei annettu parametrejä"
@@ -1641,45 +1641,46 @@ msgstr "en voinut avata tiedostoa %s: "
msgid "error creating temporary file %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/package.c:237
+#: lib/package.c:593
#, fuzzy
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
"tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
-#: lib/package.c:245
+#: lib/package.c:601
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
"tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature epäonnistui\n"
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ei allekirjoitusta saatavilla\n"
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead epäonnistui\n"
@@ -1780,7 +1781,7 @@ msgstr "lyhenne parametreille --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
#, fuzzy
msgid "<packagefile>+"
msgstr " -b<vaihe> <määrittely> "
@@ -1846,42 +1847,47 @@ msgstr "älä suorita mitään vaiheita"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "älä suorita mitään vaiheita"
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "älä tarkista paketin riippuvuuksia"
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "älä tarkista paketin arkkitehtuuria"
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
#, fuzzy
msgid "don't verify package signature(s)"
msgstr "tarkista paketin allekirjoitus"
-#: lib/poptI.c:197
+#: lib/poptI.c:199
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "älä aja mitään pakettikohtaisia skriptejä"
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "älä suorita asennusskriptejä"
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "älä suorita asennusskriptejä"
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "älä suorita asennusskriptejä"
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1889,49 +1895,49 @@ msgstr ""
"päivitä vanhempaan versioon (--force päivitettäessä tekee tämän "
"automaattisesti)"
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr "tulosta asennuksen eteneminen prosentteina"
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr "siirrä paketti hakemistoon <hakem>, jos siirrettävissä"
-#: lib/poptI.c:222
+#: lib/poptI.c:224
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
-#: lib/poptI.c:223
+#: lib/poptI.c:225
#, fuzzy
msgid "<old>=<new>"
msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr "asenna vaikka paketti korvaisi asennettuja tiedostoja"
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr "asenna uudelleen, jos paketti on jo asennettu"
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr "älä asenna, mutta kerro onnistuisiko se"
-#: lib/poptI.c:240
+#: lib/poptI.c:242
#, fuzzy
msgid "upgrade package(s)"
msgstr "asenna paketti"
@@ -2078,85 +2084,85 @@ msgstr ""
msgid "display a verbose file listing"
msgstr "näytä paketin tiedostolistaus"
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
#, fuzzy
msgid "don't verify MD5 digest of files"
msgstr "asenna paketti"
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
#, fuzzy
msgid "don't verify size of files"
msgstr "asenna paketti"
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
#, fuzzy
msgid "don't verify symlink path of files"
msgstr "asenna paketti"
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
#, fuzzy
msgid "don't verify owner of files"
msgstr "asenna paketti"
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
#, fuzzy
msgid "don't verify group of files"
msgstr "asenna paketti"
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
#, fuzzy
msgid "don't verify mode of files"
msgstr "asenna paketti"
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
#, fuzzy
msgid "don't verify files in package"
msgstr "asenna paketti"
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
#, fuzzy
msgid "don't verify package dependencies"
msgstr "älä tarkista paketin riippuvuuksia"
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "älä suorita mitään vaiheita"
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "asenna paketti"
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "asenna paketti"
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
#, fuzzy
msgid "sign package(s) (identical to --resign)"
msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
#, fuzzy
msgid "verify package signature(s)"
msgstr "tarkista paketin allekirjoitus"
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
#, fuzzy
msgid "sign package(s) (identical to --addsign)"
msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
#, fuzzy
msgid "generate signature"
msgstr "generoi PGP-allekirjoitus"
@@ -2231,7 +2237,7 @@ msgstr "en voinut avata %s: %s"
msgid "%s failed: %s\n"
msgstr "pgp epäonnistui"
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "virhe formaatissa: %s\n"
@@ -2282,8 +2288,8 @@ msgstr "paketilla ei ole nimeä"
msgid "can't query %s: %s\n"
msgstr "virhe: en voi avata %s\n"
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "%s:n avaus ei onnistunut: %s\n"
@@ -2297,7 +2303,7 @@ msgstr "%s:n kysely ei onnistunut\n"
msgid "old format source packages cannot be queried\n"
msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n"
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "mikään paketti ei laukaise %s:a\n"
@@ -2367,7 +2373,7 @@ msgstr "virheellinen paketin numero: %s\n"
msgid "record %u could not be read\n"
msgstr "tietuetta %d ei voitu lukea\n"
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr "paketti %s ei ole asennettu\n"
@@ -2541,84 +2547,84 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "asennukselle ei määritelty paketteja"
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr "Haen: %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "virhe: %s ei voida asentaa\n"
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "ryhmässä %s ei ole paketteja\n"
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "puuttuvat riippuvuudet:\n"
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
#, fuzzy
msgid "installing binary packages\n"
msgstr "asenna paketti"
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "en voinut avata tiedostoa %s: "
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" määrittää useita paketteja\n"
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "virhe: en voi avata %s\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr "Asennan: %s\n"
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "poistolle ei määritelty paketteja"
@@ -2835,13 +2841,13 @@ msgstr "En voi avata %s luettavaksi: %s."
msgid "cannot open Packages database in %s\n"
msgstr "virhe: en voi avata %s%s/packages.rpm\n"
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, fuzzy, c-format
msgid "cannot open Solve database in %s\n"
msgstr "virhe: en voi avata %s%s/packages.rpm\n"
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -3054,10 +3060,10 @@ msgstr ""
#: lib/verify.c:288
#, fuzzy, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr "puuttuva '{' '%':n jälkeen"
-#: lib/verify.c:389
+#: lib/verify.c:395
#, fuzzy, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:"
@@ -3237,165 +3243,180 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, fuzzy, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "en voinut avata tiedostoa %s: "
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, fuzzy, c-format
msgid "cannot open %s index\n"
msgstr "virhe: en voi avata %s\n"
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
#, fuzzy
msgid "no dbpath has been set\n"
msgstr "dbpath ei ole asetettu"
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "virhe luettaessa tietuetta %s %s:stä"
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, fuzzy, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "virhe talletettaessa tietuetta %s %s:ään"
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
+#, c-format
+msgid "h#%6u: already checked.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2136
+#, fuzzy, c-format
+msgid "h#%6u: %s"
+msgstr "en voinut avata %s: %s"
+
+#: rpmdb/rpmdb.c:2142
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "rpmdb: header #%u: %s -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, 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:2365
+#: rpmdb/rpmdb.c:2500
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "virhe luettaessa tietuetta %s %s:stä"
-#: rpmdb/rpmdb.c:2480
+#: rpmdb/rpmdb.c:2615
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "virhe luettaessa tietuetta %s %s:stä"
-#: rpmdb/rpmdb.c:2533
+#: rpmdb/rpmdb.c:2668
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "virhe talletettaessa tietuetta %s %s:ään"
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "virhe etsittäessä pakettia %s\n"
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "virhe poistettaessa tietuetta %s %s:stä"
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "virhe talletettaessa tietuetta %s %s:ään"
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr "dbpath ei ole asetettu"
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "väliaikainen tietokanta %s on jo olemassa"
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, fuzzy, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen"
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "en voi lisätä tietuetta %d:stä"
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "en voinut avata %s: %s"
diff --git a/po/fr.po b/po/fr.po
index d30e37355..1c259069d 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -122,7 +122,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr " --root <dir>\t- utilise <dir> comme rpertoire racine"
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -439,41 +439,41 @@ msgstr "--sign ne peut tre spcifi que lors de la construction d'un package"
msgid "exec failed\n"
msgstr "La construction a chou.\n"
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr "aucun package n'a t spcifi pour la reconstruction"
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr "aucun package n'a t spcifi pour la construction"
-#: rpmqv.c:1039
+#: rpmqv.c:1041
#, fuzzy
msgid "no tar files given for build"
msgstr "aucun package n'a t spcifi pour la construction"
-#: rpmqv.c:1061
+#: rpmqv.c:1063
#, fuzzy
msgid "no packages given for erase"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr "aucun argument n'a t fourni pour la requte"
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr "aucun argument n'a t fourni pour la vrification"
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1157
#, fuzzy
msgid "no arguments given"
msgstr "aucun argument n'a t fourni pour la requte"
@@ -1669,41 +1669,42 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "error creating temporary file %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
@@ -1802,7 +1803,7 @@ msgstr " --force - raccourci pour --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
#, fuzzy
msgid "<packagefile>+"
msgstr " -i <packagefile>\t- installe le package"
@@ -1872,45 +1873,49 @@ msgstr ""
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
#, fuzzy
msgid "don't verify package digest(s)"
msgstr ""
" -f <file>+ - interroge le package qui appartient <file>"
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
#, fuzzy
msgid "don't verify package signature(s)"
msgstr ""
" -f <file>+ - interroge le package qui appartient <file>"
-#: lib/poptI.c:197
+#: lib/poptI.c:199
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
" -f <file>+ - interroge le package qui appartient <file>"
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:215
#, fuzzy
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
@@ -1919,56 +1924,56 @@ msgstr ""
" --oldpackage - mise jour par une ancienne version du package (--"
"force"
-#: lib/poptI.c:217
+#: lib/poptI.c:219
#, fuzzy
msgid "print percentages as package installs"
msgstr ""
" --percent - affiche des '%' pendant l'installation du package"
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:223
+#: lib/poptI.c:225
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
#, fuzzy
msgid "install even if the package replaces installed files"
msgstr ""
" --replacefiles - installe mme si le package remplace des fichiers "
"dj prsents"
-#: lib/poptI.c:232
+#: lib/poptI.c:234
#, fuzzy
msgid "reinstall if the package is already present"
msgstr " --replacepkgs - rinstalle si le package est dj prsent"
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
#, fuzzy
msgid "don't install, but tell if it would work or not"
msgstr ""
" --test - n'installe pas, mais indique si ca fonctionnerait "
"ou pas"
-#: lib/poptI.c:240
+#: lib/poptI.c:242
#, fuzzy
msgid "upgrade package(s)"
msgstr ""
@@ -2128,79 +2133,79 @@ msgstr ""
msgid "display a verbose file listing"
msgstr " -l - affiche la liste des packages"
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
msgid "don't verify MD5 digest of files"
msgstr ""
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
#, fuzzy
msgid "don't verify size of files"
msgstr ""
" -f <file>+ - interroge le package qui appartient <file>"
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
#, fuzzy
msgid "don't verify mode of files"
msgstr ""
" -f <file>+ - interroge le package qui appartient <file>"
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
msgid "don't verify GPG V3 DSA signature(s)"
msgstr ""
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr ""
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
#, fuzzy
msgid "sign package(s) (identical to --resign)"
msgstr "aucun package n'a t spcifi pour la dsinstallation"
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
#, fuzzy
msgid "verify package signature(s)"
msgstr " --sign - genre une signature PGP"
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
#, fuzzy
msgid "sign package(s) (identical to --addsign)"
msgstr "aucun package n'a t spcifi pour la dsinstallation"
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
#, fuzzy
msgid "generate signature"
msgstr " --sign - genre une signature PGP"
@@ -2276,7 +2281,7 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "%s failed: %s\n"
msgstr "La construction a chou.\n"
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
@@ -2327,8 +2332,8 @@ msgstr "aucun package n'a t spcifi pour l'installation"
msgid "can't query %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "La construction a chou.\n"
@@ -2342,7 +2347,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "aucun package n'a t spcifi pour l'installation"
@@ -2412,7 +2417,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, fuzzy, c-format
msgid "package %s is not installed\n"
msgstr "aucun package n'a t spcifi pour l'installation"
@@ -2585,83 +2590,83 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "aucun package n'a t spcifi pour la dsinstallation"
@@ -2878,13 +2883,13 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "cannot open Packages database in %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, fuzzy, c-format
msgid "cannot open Solve database in %s\n"
msgstr "impossible d'ouvrir: %s\n"
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -3093,10 +3098,10 @@ msgstr ""
#: lib/verify.c:288
#, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:389
+#: lib/verify.c:395
#, fuzzy, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr "impossible d'ouvrir: %s\n"
@@ -3276,164 +3281,179 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, fuzzy, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, fuzzy, c-format
msgid "cannot open %s index\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, fuzzy, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "h#%6u: already checked.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2136
+#, fuzzy, c-format
+msgid "h#%6u: %s"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: rpmdb/rpmdb.c:2142
+#, c-format
+msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, 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:2365
+#: rpmdb/rpmdb.c:2500
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:2533
+#: rpmdb/rpmdb.c:2668
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "impossible d'ouvrir: %s\n"
diff --git a/po/gl.po b/po/gl.po
index dff1d6e05..36e5b1020 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -113,7 +113,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -387,39 +387,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1063
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1157
msgid "no arguments given"
msgstr ""
@@ -1579,41 +1579,42 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -1706,7 +1707,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
msgid "<packagefile>+"
msgstr ""
@@ -1770,85 +1771,89 @@ msgstr ""
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:199
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:223
+#: lib/poptI.c:225
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:240
+#: lib/poptI.c:242
msgid "upgrade package(s)"
msgstr ""
@@ -1971,71 +1976,71 @@ msgstr ""
msgid "display a verbose file listing"
msgstr ""
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
msgid "don't verify MD5 digest of files"
msgstr ""
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
msgid "don't execute verify script(s)"
msgstr ""
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
msgid "don't verify GPG V3 DSA signature(s)"
msgstr ""
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr ""
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
msgid "sign package(s) (identical to --resign)"
msgstr ""
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
msgid "verify package signature(s)"
msgstr ""
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
msgid "sign package(s) (identical to --addsign)"
msgstr ""
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
msgid "generate signature"
msgstr ""
@@ -2108,7 +2113,7 @@ msgstr ""
msgid "%s failed: %s\n"
msgstr ""
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
@@ -2156,8 +2161,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2171,7 +2176,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2240,7 +2245,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2410,82 +2415,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2701,13 +2706,13 @@ msgstr ""
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, c-format
msgid "cannot open Solve database in %s\n"
msgstr ""
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -2909,10 +2914,10 @@ msgstr ""
#: lib/verify.c:288
#, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:389
+#: lib/verify.c:395
#, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr ""
@@ -3088,164 +3093,179 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr ""
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, c-format
msgid "cannot open %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "h#%6u: already checked.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2136
+#, c-format
+msgid "h#%6u: %s"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2142
+#, c-format
+msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2365
+#: rpmdb/rpmdb.c:2500
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2533
+#: rpmdb/rpmdb.c:2668
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 43b65b50f..14b69f830 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -392,39 +392,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1063
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1157
msgid "no arguments given"
msgstr ""
@@ -1584,41 +1584,42 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -1711,7 +1712,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
msgid "<packagefile>+"
msgstr ""
@@ -1775,85 +1776,89 @@ msgstr ""
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:199
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:223
+#: lib/poptI.c:225
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:240
+#: lib/poptI.c:242
msgid "upgrade package(s)"
msgstr ""
@@ -1976,71 +1981,71 @@ msgstr ""
msgid "display a verbose file listing"
msgstr ""
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
msgid "don't verify MD5 digest of files"
msgstr ""
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
msgid "don't execute verify script(s)"
msgstr ""
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
msgid "don't verify GPG V3 DSA signature(s)"
msgstr ""
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr ""
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
msgid "sign package(s) (identical to --resign)"
msgstr ""
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
msgid "verify package signature(s)"
msgstr ""
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
msgid "sign package(s) (identical to --addsign)"
msgstr ""
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
msgid "generate signature"
msgstr ""
@@ -2113,7 +2118,7 @@ msgstr ""
msgid "%s failed: %s\n"
msgstr ""
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
@@ -2161,8 +2166,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2176,7 +2181,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2245,7 +2250,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2415,82 +2420,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2706,13 +2711,13 @@ msgstr ""
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, c-format
msgid "cannot open Solve database in %s\n"
msgstr ""
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -2914,10 +2919,10 @@ msgstr ""
#: lib/verify.c:288
#, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:389
+#: lib/verify.c:395
#, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr ""
@@ -3093,164 +3098,179 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr ""
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, c-format
msgid "cannot open %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "h#%6u: already checked.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2136
+#, c-format
+msgid "h#%6u: %s"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2142
+#, c-format
+msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2365
+#: rpmdb/rpmdb.c:2500
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2533
+#: rpmdb/rpmdb.c:2668
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/id.po b/po/id.po
index 43b65b50f..14b69f830 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -392,39 +392,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1063
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1157
msgid "no arguments given"
msgstr ""
@@ -1584,41 +1584,42 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -1711,7 +1712,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
msgid "<packagefile>+"
msgstr ""
@@ -1775,85 +1776,89 @@ msgstr ""
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:199
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:223
+#: lib/poptI.c:225
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:240
+#: lib/poptI.c:242
msgid "upgrade package(s)"
msgstr ""
@@ -1976,71 +1981,71 @@ msgstr ""
msgid "display a verbose file listing"
msgstr ""
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
msgid "don't verify MD5 digest of files"
msgstr ""
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
msgid "don't execute verify script(s)"
msgstr ""
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
msgid "don't verify GPG V3 DSA signature(s)"
msgstr ""
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr ""
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
msgid "sign package(s) (identical to --resign)"
msgstr ""
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
msgid "verify package signature(s)"
msgstr ""
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
msgid "sign package(s) (identical to --addsign)"
msgstr ""
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
msgid "generate signature"
msgstr ""
@@ -2113,7 +2118,7 @@ msgstr ""
msgid "%s failed: %s\n"
msgstr ""
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
@@ -2161,8 +2166,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2176,7 +2181,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2245,7 +2250,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2415,82 +2420,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2706,13 +2711,13 @@ msgstr ""
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, c-format
msgid "cannot open Solve database in %s\n"
msgstr ""
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -2914,10 +2919,10 @@ msgstr ""
#: lib/verify.c:288
#, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:389
+#: lib/verify.c:395
#, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr ""
@@ -3093,164 +3098,179 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr ""
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, c-format
msgid "cannot open %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "h#%6u: already checked.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2136
+#, c-format
+msgid "h#%6u: %s"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2142
+#, c-format
+msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2365
+#: rpmdb/rpmdb.c:2500
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2533
+#: rpmdb/rpmdb.c:2668
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/is.po b/po/is.po
index 426e38f9b..92f00cb42 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -115,7 +115,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -390,39 +390,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1063
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1157
msgid "no arguments given"
msgstr ""
@@ -1589,41 +1589,42 @@ msgstr "get ekki ritað í %%%s %s\n"
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: Fseek brást: %s\n"
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -1716,7 +1717,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
msgid "<packagefile>+"
msgstr "<pakkaskrá>+"
@@ -1781,87 +1782,92 @@ msgstr ""
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "ekki skoða pakkaskilyrðin"
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "ekki skoða pakkaskilyrðin"
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
#, fuzzy
msgid "don't verify package signature(s)"
msgstr "ekki skoða pakkaskilyrðin"
-#: lib/poptI.c:197
+#: lib/poptI.c:199
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:223
+#: lib/poptI.c:225
msgid "<old>=<new>"
msgstr "<gömul>=<ný>"
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:240
+#: lib/poptI.c:242
msgid "upgrade package(s)"
msgstr "uppfæra pakka"
@@ -1989,74 +1995,74 @@ msgstr ""
msgid "display a verbose file listing"
msgstr ""
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
msgid "don't verify MD5 digest of files"
msgstr "ekki yfirfara MD5 undirritun skráa"
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
msgid "don't verify size of files"
msgstr "ekki yfirfara stærð skráa"
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
msgid "don't verify symlink path of files"
msgstr "ekki yfirfara symlink slóð skráa"
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
msgid "don't verify owner of files"
msgstr "ekki yfirfara eiganda skráa"
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
msgid "don't verify group of files"
msgstr "ekki yfirfara hop skráa"
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
msgid "don't verify mode of files"
msgstr "ekki yfirfara heimildir skráa"
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr "ekki yfirfara skrárnar í pakkanum"
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr "ekki skoða pakkaskilyrðin"
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
msgid "don't execute verify script(s)"
msgstr ""
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "ekki yfirfara SHA1 undirritunina"
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "ekki yfirfara MD5 undirritun skráa"
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
msgid "sign package(s) (identical to --resign)"
msgstr ""
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
#, fuzzy
msgid "verify package signature(s)"
msgstr "búa til undirskrift"
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
msgid "sign package(s) (identical to --addsign)"
msgstr ""
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
msgid "generate signature"
msgstr "búa til undirskrift"
@@ -2129,7 +2135,7 @@ msgstr "gat ekki opnað %s: %s\n"
msgid "%s failed: %s\n"
msgstr "%s brást\n"
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
@@ -2177,8 +2183,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2192,7 +2198,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "get ekki opnað pakka gagnagrunn í\n"
@@ -2261,7 +2267,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2431,83 +2437,83 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "gat ekki útbúið pakkaskilyrði:\n"
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2723,13 +2729,13 @@ msgstr "Get ekki opnað %s til lesturs: %s.\n"
msgid "cannot open Packages database in %s\n"
msgstr "get ekki opnað pakka gagnagrunn í %s\n"
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, fuzzy, c-format
msgid "cannot open Solve database in %s\n"
msgstr "get ekki opnað pakka gagnagrunn í %s\n"
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -2931,11 +2937,11 @@ msgid "install/erase %d elements\n"
msgstr ""
#: lib/verify.c:288
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+msgid "missing %c %s"
msgstr "vantar %s"
-#: lib/verify.c:389
+#: lib/verify.c:395
#, fuzzy, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr "Óuppfyllt pakkaskilyrði fyrir %s-%s-%s: "
@@ -3111,164 +3117,179 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "get ekki opnað %s index með db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, c-format
msgid "cannot open %s index\n"
msgstr "get ekki opnað %s index\n"
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "h#%6u: already checked.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2136
+#, fuzzy, c-format
+msgid "h#%6u: %s"
+msgstr "%s: %s\n"
+
+#: rpmdb/rpmdb.c:2142
+#, c-format
+msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2365
+#: rpmdb/rpmdb.c:2500
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2533
+#: rpmdb/rpmdb.c:2668
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/it.po b/po/it.po
index 43b65b50f..14b69f830 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -392,39 +392,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1063
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1157
msgid "no arguments given"
msgstr ""
@@ -1584,41 +1584,42 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -1711,7 +1712,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
msgid "<packagefile>+"
msgstr ""
@@ -1775,85 +1776,89 @@ msgstr ""
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:199
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:223
+#: lib/poptI.c:225
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:240
+#: lib/poptI.c:242
msgid "upgrade package(s)"
msgstr ""
@@ -1976,71 +1981,71 @@ msgstr ""
msgid "display a verbose file listing"
msgstr ""
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
msgid "don't verify MD5 digest of files"
msgstr ""
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
msgid "don't execute verify script(s)"
msgstr ""
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
msgid "don't verify GPG V3 DSA signature(s)"
msgstr ""
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr ""
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
msgid "sign package(s) (identical to --resign)"
msgstr ""
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
msgid "verify package signature(s)"
msgstr ""
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
msgid "sign package(s) (identical to --addsign)"
msgstr ""
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
msgid "generate signature"
msgstr ""
@@ -2113,7 +2118,7 @@ msgstr ""
msgid "%s failed: %s\n"
msgstr ""
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
@@ -2161,8 +2166,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2176,7 +2181,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2245,7 +2250,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2415,82 +2420,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2706,13 +2711,13 @@ msgstr ""
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, c-format
msgid "cannot open Solve database in %s\n"
msgstr ""
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -2914,10 +2919,10 @@ msgstr ""
#: lib/verify.c:288
#, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:389
+#: lib/verify.c:395
#, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr ""
@@ -3093,164 +3098,179 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr ""
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, c-format
msgid "cannot open %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "h#%6u: already checked.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2136
+#, c-format
+msgid "h#%6u: %s"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2142
+#, c-format
+msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2365
+#: rpmdb/rpmdb.c:2500
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2533
+#: rpmdb/rpmdb.c:2668
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 4495ee305..7c0753765 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -122,7 +122,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "¥È¥Ã¥×¥Ç¥£¥ì¥¯¥È¥ê¤È¤·¤Æ <dir> ¤ò»ÈÍѤ·¤Þ¤¹"
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -419,40 +419,40 @@ msgstr "--sign ¤Ï¥Ñ¥Ã¥±¡¼¥¸ºîÀ®»þ¤Î¤ß»ÈÍѤǤ­¤Þ¤¹"
msgid "exec failed\n"
msgstr "¼Â¹Ô¼ºÇÔ\n"
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr "ºÆºîÀ®¤¹¤ë¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr "ºîÀ®¤Î¤¿¤á¤Î spec ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr "ºîÀ®(build)¤Î¤¿¤á¤Î tar ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpmqv.c:1061
+#: rpmqv.c:1063
#, fuzzy
msgid "no packages given for erase"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr "Ì䤤¹ç¤ï¤»¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr "¸¡¾Ú¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó"
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr "--querytags ¤Î°ú¿ô¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
-#: rpmqv.c:1155
+#: rpmqv.c:1157
#, fuzzy
msgid "no arguments given"
msgstr "Ì䤤¹ç¤ï¤»¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó"
@@ -1666,45 +1666,46 @@ msgstr "%s ¤Ø½ñ¤­¹þ¤á¤Þ¤»¤ó"
msgid "error creating temporary file %s\n"
msgstr "°ì»þ¥Õ¥¡¥¤¥ë %s ¤ÎºîÀ®¥¨¥é¡¼"
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-#: lib/package.c:237
+#: lib/package.c:593
#, fuzzy
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
"¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹"
-#: lib/package.c:245
+#: lib/package.c:601
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
"¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹"
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Í­¸ú¤Ê½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó\n"
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
@@ -1805,7 +1806,7 @@ msgstr "--replacepkgs ¤È --replacefiles ¤òû½Ì¤·¤¿¤â¤Î"
msgid "upgrade package(s) if already installed"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
#, fuzzy
msgid "<packagefile>+"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
@@ -1875,44 +1876,49 @@ msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Þ¤»¤ó"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Þ¤»¤ó"
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î°Í¸´Ø·¸¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ÎÂоݥ¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
#, fuzzy
msgid "don't verify package signature(s)"
msgstr "½ð̾¤Î¸¡¾Ú¤ò¤·¤Þ¤¹"
-#: lib/poptI.c:197
+#: lib/poptI.c:199
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
"¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥¹¥¯¥ê¥×¥È¤ò\n"
"¼Â¹Ô¤·¤Þ¤»¤ó"
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "¥Ñ¥Ã¥±¡¼¥¸»ØÄê¤Î¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó"
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó"
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó"
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó"
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1920,53 +1926,53 @@ msgstr ""
"¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Þ¤¹\n"
"(¥¢¥Ã¥×¥°¥ì¡¼¥É»þ¤Î --force ¤Ï¤³¤ì¤ò¼«Æ°Åª¤Ë¹Ô¤¤¤Þ¤¹)"
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëºÝ¤Ë '%' ¤Çɽ¼¨¤·¤Þ¤¹"
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
"ºÆÇÛÃÖ²Äǽ¤Ê¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ·¡¢¥¤¥ó¥¹¥È¡¼¥ë¥Ñ¥¹\n"
"ÀÜƬ¼­¤ò <dir> ¤ËÀßÄꤷ¤Þ¤¹"
-#: lib/poptI.c:222
+#: lib/poptI.c:224
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "<oldpath> ¤«¤é <newpath> ¤Ë¥Õ¥¡¥¤¥ë¤òºÆÇÛÃÖ¤µ¤»¤Þ¤¹"
-#: lib/poptI.c:223
+#: lib/poptI.c:225
#, fuzzy
msgid "<old>=<new>"
msgstr "<oldpath> ¤«¤é <newpath> ¤Ë¥Õ¥¡¥¤¥ë¤òºÆÇÛÃÖ¤µ¤»¤Þ¤¹"
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr ""
"¥¤¥ó¥¹¥È¡¼¥ë»þ¤ËÃÖ¤­´¹¤¨¤é¤ì¤ë¥Õ¥¡¥¤¥ë¤¬\n"
"¤¢¤Ã¤Æ¤â¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹"
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr "´û¤Ë¸ºß¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ç¤âºÆ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹"
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤»¤º¤Ë¡¢¥Æ¥¹¥È¤Î¤ß¹Ô¤¤¤Þ¤¹"
-#: lib/poptI.c:240
+#: lib/poptI.c:242
#, fuzzy
msgid "upgrade package(s)"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
@@ -2114,85 +2120,85 @@ msgstr "Îóµó¤·¤¿¥Õ¥¡¥¤¥ë¤Î¾õÂÖ¤òɽ¼¨¤·¤Þ¤¹"
msgid "display a verbose file listing"
msgstr "¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤ò¾éŤËɽ¼¨¤·¤Þ¤¹"
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
#, fuzzy
msgid "don't verify MD5 digest of files"
msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
#, fuzzy
msgid "don't verify size of files"
msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
#, fuzzy
msgid "don't verify symlink path of files"
msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
#, fuzzy
msgid "don't verify owner of files"
msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
#, fuzzy
msgid "don't verify group of files"
msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
#, fuzzy
msgid "don't verify mode of files"
msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
#, fuzzy
msgid "don't verify files in package"
msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
#, fuzzy
msgid "don't verify package dependencies"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î°Í¸´Ø·¸¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Þ¤»¤ó"
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
#, fuzzy
msgid "sign package(s) (identical to --resign)"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤·¤Þ¤¹(¸½ºß¤Î½ð̾¤Ï¼Î¤Æ¤é¤ì¤Þ¤¹)"
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
#, fuzzy
msgid "verify package signature(s)"
msgstr "½ð̾¤Î¸¡¾Ú¤ò¤·¤Þ¤¹"
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
#, fuzzy
msgid "sign package(s) (identical to --addsign)"
msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤·¤Þ¤¹(¸½ºß¤Î½ð̾¤Ï¼Î¤Æ¤é¤ì¤Þ¤¹)"
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
#, fuzzy
msgid "generate signature"
msgstr "PGP/GPG ½ð̾¤òÀ¸À®¤·¤Þ¤¹"
@@ -2269,7 +2275,7 @@ msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s"
msgid "%s failed: %s\n"
msgstr "%s ¼ºÇÔ"
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "¥Õ¥©¡¼¥Þ¥Ã¥ÈÃæ¤Î¥¨¥é¡¼: %s\n"
@@ -2319,8 +2325,8 @@ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ï¥Õ¥¡¥¤¥ë½êÍ­¼Ô¤ä id ¥ê¥¹¥È¤ò¤É¤Á¤é¤â»ý¤Ã¤Æ¤¤¤Þ¤»¤ó"
msgid "can't query %s: %s\n"
msgstr "%s ¤òºï½ü(unlink)¤Ç¤­¤Þ¤»¤ó: %s\n"
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n"
@@ -2334,7 +2340,7 @@ msgstr "%s ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
msgid "old format source packages cannot be queried\n"
msgstr "µì·Á¼°¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n"
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "%s ¤ò¥È¥ê¥¬¡¼¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n"
@@ -2404,7 +2410,7 @@ msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥ÉÈÖ¹æ %d\n"
msgid "record %u could not be read\n"
msgstr "¥ì¥³¡¼¥É %d ¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
@@ -2581,83 +2587,83 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó"
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr "%s ¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr "%s ¤È¤·¤Æ...\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s ¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹ - žÁ÷¼ºÇÔ - %s\n"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Þ¤»¤ó"
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤«¤é¤ÎÆɤ߹þ¤ß¥¨¥é¡¼ "
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¤Ï¤è¤ê¿·¤·¤¤ RPM ¤Î¥Ð¡¼¥¸¥ç¥ó¤¬É¬ÍפǤ¹\n"
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó\n"
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿\n"
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "°Í¸À­¤Î·çÇ¡:\n"
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr "¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n"
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s"
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ¤ÏÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹\n"
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n"
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2883,13 +2889,13 @@ msgstr "Æɤ߹þ¤à¤¿¤á¤Ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s¡£"
msgid "cannot open Packages database in %s\n"
msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, fuzzy, c-format
msgid "cannot open Solve database in %s\n"
msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr "¥Þ¥¦¥ó¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥ê¥¹¥È¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹\n"
@@ -3103,10 +3109,10 @@ msgstr ""
#: lib/verify.c:288
#, fuzzy, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr "%s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
-#: lib/verify.c:389
+#: lib/verify.c:395
#, fuzzy, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À­¤òËþ¤¿¤·¤Æ¤¤¤Þ¤»¤ó:"
@@ -3285,167 +3291,182 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, fuzzy, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó %s:%d"
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, fuzzy, c-format
msgid "cannot open %s index\n"
msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
#, fuzzy
msgid "no dbpath has been set\n"
msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)"
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, fuzzy, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ "
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
+#, c-format
+msgid "h#%6u: already checked.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2136
+#, fuzzy, c-format
+msgid "h#%6u: %s"
+msgstr "¥Õ¥¡¥¤¥ë %s: %s\n"
+
+#: rpmdb/rpmdb.c:2142
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "rpmdb: header #%u: %s -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó"
-#: rpmdb/rpmdb.c:2365
+#: rpmdb/rpmdb.c:2500
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)"
-#: rpmdb/rpmdb.c:2480
+#: rpmdb/rpmdb.c:2615
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "name ¥¤¥ó¥Ç¥Ã¥¯¥¹ºï½ü¤·¤Þ¤¹\n"
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)"
-#: rpmdb/rpmdb.c:2533
+#: rpmdb/rpmdb.c:2668
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ "
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ëºï½ü¤Ç¥¨¥é¡¼"
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n"
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n"
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n"
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ "
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "rootdir %s Ãæ¤Ç¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹\n"
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "°ì»þŪ¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹"
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n"
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n"
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n"
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n"
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, fuzzy, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥­¥Ã¥×¤·¤Þ¤¹"
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ­¤Þ¤»¤ó"
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
#, fuzzy
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Þ¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Þ¤¹\n"
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤­´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n"
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, fuzzy, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ð¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤­´¹¤¨¤Þ¤¹"
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n"
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n"
diff --git a/po/ko.po b/po/ko.po
index cf21cef41..03d2c31d0 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -115,7 +115,7 @@ msgstr "<¸í·É>"
msgid "use <dir> as the top level directory"
msgstr "<µð·ºÅ丮>¸¦ ÃÖ»óÀ§ µð·ºÅ丮·Î »ç¿ëÇÕ´Ï´Ù"
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr "<µð·ºÅ丮>"
@@ -397,39 +397,39 @@ msgstr "--sign ¿É¼ÇÀº ÆÐÅ°Áö Á¦À۽ÿ¡¸¸ »ç¿ëÇÒ ¼ö ÀÖ½À´Ï´Ù"
msgid "exec failed\n"
msgstr "½ÇÇà¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr "ÀçÁ¦ÀÛ(rebuild)ÇÒ ÆÐÅ°Áö ÆÄÀÏÀÌ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr "ÆÐÅ°Áö Á¦ÀÛ¿¡ ÇÊ¿äÇÑ spec ÆÄÀÏÀÌ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr "ÆÐÅ°Áö Á¦ÀÛ¿¡ ÇÊ¿äÇÑ tar ÆÄÀÏÀÌ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
-#: rpmqv.c:1061
+#: rpmqv.c:1063
msgid "no packages given for erase"
msgstr "»èÁ¦ÇÒ ÆÐÅ°Áö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr "¼³Ä¡ÇÒ ÆÐÅ°Áö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr "ÁúÀÇ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr "°ËÁõ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr "--querytags ¿É¼Ç¿¡ ºÎÀûÀýÇÑ Àμö°¡ ÁöÁ¤µÇ¾ú½À´Ï´Ù "
-#: rpmqv.c:1155
+#: rpmqv.c:1157
#, fuzzy
msgid "no arguments given"
msgstr "ÁúÀÇ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
@@ -1605,41 +1605,42 @@ msgstr "%%%s %s(À»)¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n"
msgid "error creating temporary file %s\n"
msgstr "Àӽà ÆÄÀÏ %s(À»)¸¦ »ý¼ºÇÏ´Â µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n"
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLeadÀÌ ½ÇÆÐÇß½À´Ï´Ù\n"
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "ÀÌ RPM ¹öÀüÀº ÆÐŰ¡ ¹öÀü '1' À» Áö¿øÇÏÁö ¾Ê½À´Ï´Ù\n"
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "ÀÌ RPM ¹öÀüÀº ÁÖ ¹øÈ£(major number)°¡ <= 4 ÀÎ ÆÐŰ¡ ¸¸À» Áö¿øÇÕ´Ï´Ù\n"
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignatureÀÌ ½ÇÆÐÇß½À´Ï´Ù\n"
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù\n"
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLeadÀÌ ½ÇÆÐÇß½À´Ï´Ù\n"
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: FreadÀÌ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
@@ -1737,7 +1738,7 @@ msgstr "--replacepkgs ¿Í --replacefiles ¿É¼ÇÀ» µ¿½Ã¿¡ »ç¿ëÇÕ´Ï´Ù"
msgid "upgrade package(s) if already installed"
msgstr "±âÁ¸¿¡ ¼³Ä¡µÈ ÆÐÅ°Áö¸¦ ¾÷±×·¹À̵å ÇÕ´Ï´Ù"
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
msgid "<packagefile>+"
msgstr "<ÆÐÅ°ÁöÆÄÀÏ>+"
@@ -1804,43 +1805,48 @@ msgstr "%%preun ½ºÅ©¸³Æ²¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù (ÀÖÀ» °æ¿ì)"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "%%postun ½ºÅ©¸³Æ²¸´(scriptlet)À» ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù (ÀÖÀ» °æ¿ì)"
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "ÆÐÅ°ÁöÀÇ ÀÇÁ¸¼ºÀ» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "ÆÐÅ°ÁöÀÇ ¾ÆÅ°ÅØÃĸ¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
#, fuzzy
msgid "don't verify package signature(s)"
msgstr "ÆÐÅ°ÁöÀÇ ¼­¸íÀ» °Ë»çÇÕ´Ï´Ù"
-#: lib/poptI.c:197
+#: lib/poptI.c:199
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
"ÀÌ ÆÐÅ°Áö¿¡ ÀÇÇØ »ý¼ºµÇ´Â(triggered) ¾î¶°ÇÑ ½ºÅ©¸³Æ²¸´(scriptlet)µµ ½ÇÇàÇÏÁö "
"¾Ê½À´Ï´Ù"
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "¾î¶°ÇÑ %%triggerprein ½ºÅ©¸³Æ²¸´(scriptlet)µµ ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "¾î¶°ÇÑ %%triggerin ½ºÅ©¸³Æ²¸´(scriptlet)µµ ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "¾î¶°ÇÑ %%triggerun ½ºÅ©¸³Æ²¸´(scriptlet)µµ ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "¾î¶°ÇÑ %%triggerpostun ½ºÅ©¸³Æ²¸´(scriptlet)µµ ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1848,48 +1854,48 @@ msgstr ""
"ÀÌÀü ¹öÀüÀÇ ÆÐÅ°Áö·Î ´Ù¿î±×·¹À̵å ÇÕ´Ï´Ù (--force ¿É¼ÇÀ» »ç¿ë½Ã¿¡´Â ÀÌ ¿É¼Ç"
"ÀÌ ÀÚµ¿À¸·Î Àû¿ëµË´Ï´Ù)"
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr "ÆÐÅ°Áö ¼³Ä¡¸¦ ÆÛ¼¾Æ®(%)·Î Ç¥½ÃÇÕ´Ï´Ù"
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
"Àç¹èÄ¡ ±â´ÉÀÌ ÀÖ´Â ÆÐÅ°ÁöÀÇ °æ¿ì, ÁöÁ¤ÇÑ <µð·ºÅ丮>·Î Àç¹èÄ¡ÇÏ¿© ¼³Ä¡ÇÕ´Ï´Ù"
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr "<ÀÌÀü°æ·Î>¿¡¼­ <»õ·Î¿î°æ·Î>·Î ÆÄÀÏÀ» Àç¹èÄ¡ ÇÕ´Ï´Ù"
-#: lib/poptI.c:223
+#: lib/poptI.c:225
msgid "<old>=<new>"
msgstr "<ÀÌÀü°æ·Î>=<»õ·Î¿î°æ·Î>"
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr "ÀçÆÐŰ¡(repackaging)À¸·Î ÀÎÇØ »èÁ¦µÇ´Â ÆÐÅ°Áö ÆÄÀÏÀ» ÀúÀåÇÕ´Ï´Ù"
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr "ÆÐÅ°Áö ¼³Ä¡½Ã ±âÁ¸¿¡ ¼³Ä¡µÇ¾î ÀÖ´Â ÆÄÀÏÀ» µ¤¾î¾¹´Ï´Ù"
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr "ÆÐÅ°Áö°¡ ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ´Â °æ¿ì¿¡µµ ¼³Ä¡ÇÕ´Ï´Ù"
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr "»õ·Î ¼³Ä¡ »èÁ¦, ÀÌÀü ¼³Ä¡ À缳ġ, ÆÐÅ°Áö, <³¯Â¥> º¹±¸(back to date)"
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr "<³¯Â¥>"
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr "ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÏÁö ¾Ê°í, Á¦´ë·Î ¼³Ä¡µÇ´ÂÁö¸¸ È®ÀÎÇÕ´Ï´Ù"
-#: lib/poptI.c:240
+#: lib/poptI.c:242
msgid "upgrade package(s)"
msgstr "ÆÐÅ°Áö¸¦ ¾÷±×·¹À̵å ÇÕ´Ï´Ù"
@@ -2014,77 +2020,77 @@ msgstr "³ª¿­µÈ ÆÄÀÏÀÇ »óÅÂ(state)¸¦ º¸¿©ÁÝ´Ï´Ù"
msgid "display a verbose file listing"
msgstr "ÆÄÀÏ ¸ñ·ÏÀ» ÀÚ¼¼È÷ º¸¿©ÁÝ´Ï´Ù"
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
msgid "don't verify MD5 digest of files"
msgstr "ÆÄÀÏÀÇ MD5 Ãà¾à(digest)À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
msgid "don't verify size of files"
msgstr "ÆÄÀÏÀÇ ¿ë·®À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
msgid "don't verify symlink path of files"
msgstr "ÆÄÀÏÀÇ ½Éº¼¸¯ ¸µÅ© °æ·Î¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
msgid "don't verify owner of files"
msgstr "ÆÄÀÏÀÇ ¼ÒÀ¯ÀÚ¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
msgid "don't verify group of files"
msgstr "ÆÄÀÏÀÇ ±×·ìÀ» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr "ÆÄÀÏÀÇ ÃÖÁ¾ º¯°æ ½Ã°£À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
msgid "don't verify mode of files"
msgstr "ÆÄÀÏÀÇ ¸ðµå¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr "ÆÐÅ°Áö ¾ÈÀÇ ÆÄÀÏÀ» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr "ÆÐÅ°ÁöÀÇ ÀÇÁ¸¼ºÀ» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "%verifyscript¸¦ ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù (ÀÖÀ» °æ¿ì)"
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "SHA1 Ãà¾à(digest) Çì´õ¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "ÆÄÀÏÀÇ MD5 Ãà¾à(digest)À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
#, fuzzy
msgid "sign package(s) (identical to --resign)"
msgstr "ÆÐÅ°Áö¿¡ ¼­¸íÇÕ´Ï´Ù (±âÁ¸ÀÇ ¼­¸íÀº »èÁ¦µË´Ï´Ù)"
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
#, fuzzy
msgid "verify package signature(s)"
msgstr "ÆÐÅ°ÁöÀÇ ¼­¸íÀ» °Ë»çÇÕ´Ï´Ù"
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
#, fuzzy
msgid "sign package(s) (identical to --addsign)"
msgstr "ÆÐÅ°Áö¿¡ ¼­¸íÇÕ´Ï´Ù (±âÁ¸ÀÇ ¼­¸íÀº »èÁ¦µË´Ï´Ù)"
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
msgid "generate signature"
msgstr "¼­¸íÀ» ÀÛ¼ºÇÕ´Ï´Ù"
@@ -2162,7 +2168,7 @@ msgstr "%2$s ÆÄÀÏÀÇ %1$s(ÀÌ)°¡ ½ÇÆÐÇÔ: %3$s\n"
msgid "%s failed: %s\n"
msgstr "%s(ÀÌ)°¡ ½ÇÆÐÇÔ: %s\n"
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr "¿Ã¹Ù¸£Áö ¸øÇÑ Çü½Ä: %s\n"
@@ -2211,8 +2217,8 @@ msgstr "ÆÐÅ°Áö¿¡ ÆÄÀÏ ¼ÒÀ¯ÀÚ ¶Ç´Â id ¸ñ·ÏÀÌ ¾ø½À´Ï´Ù\n"
msgid "can't query %s: %s\n"
msgstr "%s(À»)¸¦ ÁúÀÇÇÒ ¼ö ¾øÀ½: %s\n"
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr "%s(À»)¸¦ ¿©´Âµ¥ ½ÇÆÐÇÔ: %s\n"
@@ -2226,7 +2232,7 @@ msgstr "%s(À»)¸¦ ÁúÀÇÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n"
msgid "old format source packages cannot be queried\n"
msgstr "ÀÌÀü Çü½ÄÀÇ ¼Ò½º ÆÐÅ°Áö´Â ÁúÀÇÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "%s(¿Í)°ú ÀÏÄ¡ÇÏ´Â ÆÐÅ°Áö°¡ ¾øÀ½: %s\n"
@@ -2296,7 +2302,7 @@ msgstr "ÆÐÅ°Áö ±â·Ï(record) ¹øÈ£: %u\n"
msgid "record %u could not be read\n"
msgstr "±â·Ï(record) ¹øÈ£ %u(Àº)´Â ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr "%s ÆÐÅ°Áö°¡ ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n"
@@ -2470,83 +2476,83 @@ msgstr "Áغñ Áß..."
msgid "Preparing packages for installation..."
msgstr "¼³Ä¡ÇÒ ÆÐÅ°Áö¸¦ ÁغñÇÏ°í ÀÖ½À´Ï´Ù..."
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr "%s(À»)¸¦ º¹±¸ÇÕ´Ï´Ù\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr " ... %s(À¸)·Î\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s(À»)¸¦ »ý·«ÇÕ´Ï´Ù - Àü¼Û(transfer)¿¡ ½ÇÆÐÇÔ - %s\n"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr "%s ÆÐÅ°Áö´Â Àç¹èÄ¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr "%s ÆÄÀÏÀ» Àд µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n"
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "%s ÆÄÀÏÀº ÃֽŠ¹öÀüÀÇ RPMÀ» ÇÊ¿ä·Î ÇÕ´Ï´Ù\n"
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s(Àº)´Â ¼³Ä¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "%dÀÇ ¼Ò½º¿Í %dÀÇ ¹ÙÀ̳ʸ® ÆÐÅ°Áö°¡ °Ë»öµÇ¾ú½À´Ï´Ù\n"
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇØ ½ÇÆÐÇÔ:\n"
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr "¹ÙÀ̳ʸ® ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n"
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "%s ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ¿©·¯°³ÀÇ ÆÐÅ°Áö¸¦ ÁöÁ¤ÇÕ´Ï´Ù\n"
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, c-format
msgid "cannot open %s: %s\n"
msgstr "%s(À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr "%s(À»)¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n"
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "(+%d,-%d) ÆÐÅ°Áö¸¦ %sÀ¸·Î ·Ñ¹é(rollback)ÇÕ´Ï´Ù"
@@ -2769,13 +2775,13 @@ msgstr "%s(À»)¸¦ ¿­ ¼ö ¾øÀ½: %s.\n"
msgid "cannot open Packages database in %s\n"
msgstr "%s ¾ÈÀÇ ÆÐÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n"
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, fuzzy, c-format
msgid "cannot open Solve database in %s\n"
msgstr "%sÀÇ rpm µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n"
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -2980,11 +2986,11 @@ msgid "install/erase %d elements\n"
msgstr ""
#: lib/verify.c:288
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+msgid "missing %c %s"
msgstr "´ÙÀ½À» ãÀ» ¼ö ¾øÀ½ %s"
-#: lib/verify.c:389
+#: lib/verify.c:395
#, fuzzy, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr "%s-%s-%s¿¡ ÀÇÁ¸¼º ¹®Á¦ ¹ß»ý: "
@@ -3162,170 +3168,185 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr "(±âÁ¸ÀÇ) rpm[23] ÆÐŰ¡°ú ȣȯÇÏ´Â Çì´õ¸¦ »ý¼ºÇÕ´Ï´Ù"
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
"DB ÅÂ±× ÃʱâÈ­[dbiTagsInit]: ÀÎÁõµÇÁö ¾ÊÀº ÅÂ±× À̸§: \"%s\"(Àº)´Â ¹«½ÃµË´Ï"
"´Ù\n"
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "db%2$d(À»)¸¦ ÀÌ¿ëÇÏ¿© %1$s À妽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù - %3$s (%4$d)\n"
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, c-format
msgid "cannot open %s index\n"
msgstr "%s À妽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n"
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n"
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
"%3$s À妽º¿¡¼­ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n"
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, fuzzy, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "%3$s(À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n"
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "h#%6u: already checked.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2136
+#, fuzzy, c-format
+msgid "h#%6u: %s"
+msgstr "%s: %s\n"
+
+#: rpmdb/rpmdb.c:2142
+#, fuzzy, c-format
+msgid "rpmdb: header #%u: %s -- skipping.\n"
msgstr "rpmdb: ¼Õ»óµÈ Çì´õ #%u(ÀÌ)°¡ º¹±¸(retrieved)µÇ¾ú½À´Ï´Ù, »ý·«ÇÕ´Ï´Ù.\n"
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2163
+#, fuzzy, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr "rpmdb: ¼Õ»óµÈ Çì´õ #%u(ÀÌ)°¡ º¹±¸(retrieved)µÇ¾ú½À´Ï´Ù, »ý·«ÇÕ´Ï´Ù.\n"
+
+#: rpmdb/rpmdb.c:2437
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: 0x%xÀÇ Çì´õ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n"
-#: rpmdb/rpmdb.c:2365
+#: rpmdb/rpmdb.c:2500
#, 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:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "%2$s À妽º¿¡¼­ \"%1$s\"(À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n"
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "%2$s À妽º¿¡¼­ %1$d Ç׸ñµé(entries)À» »èÁ¦ÇÕ´Ï´Ù.\n"
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
"%3$s À妽º¿¡¼­ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n"
-#: rpmdb/rpmdb.c:2533
+#: rpmdb/rpmdb.c:2668
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "%3$s(À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n"
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "%3$s¿¡¼­ %2$s ·¹Äڵ带 »èÁ¦ÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n"
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "»õ·Î¿î ÆÐÅ°Áö¸¦ ¹èÄ¡ÇÏ´Â µµÁß ¿À·ù(%d)°¡ ¹ß»ýÇß½À´Ï´Ù\n"
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "%2$s À妽º¿¡ \"%1$s\"(À»)¸¦ Ãß°¡ÇÕ´Ï´Ù.\n"
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "%2$s À妽º¿¡ %1$d Ç׸ñµé(entries)À» Ãß°¡ÇÕ´Ï´Ù.\n"
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "%3$s(À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n"
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "db3¸¦ À籸ÃàÇÑ ÈÄ¿¡ %s(À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n"
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù"
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "%2$s¿¡ %1$s µ¥ÀÌÅͺ£À̽º¸¦ À籸Ãà ÇÕ´Ï´Ù\n"
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr "Àӽà µ¥ÀÌÅͺ£À̽º %s(ÀÌ)°¡ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù\n"
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, c-format
msgid "creating directory %s\n"
msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÕ´Ï´Ù\n"
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, c-format
msgid "creating directory %s: %s\n"
msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÔ: %s\n"
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "dbapi %d·Î ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n"
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "dbapi %d·Î »õ·Î¿î µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n"
-#: rpmdb/rpmdb.c:3424
-#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+#: rpmdb/rpmdb.c:3565
+#, fuzzy, c-format
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr "µ¥ÀÌÅͺ£À̽ºÀÇ ·¹ÄÚµå ¹øÈ£ %u(ÀÌ)°¡ À߸øµÇ¾ú½À´Ï´Ù -- »ý·«ÇÕ´Ï´Ù.\n"
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "%u¿¡ óÀ½ºÎÅÍ ·¹Äڵ带 Ãß°¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n"
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"µ¥ÀÌÅͺ£À̽º¸¦ À籸ÃàÇϴµ¥ ½ÇÆÐÇÔ: ¿øº» µ¥ÀÌÅͺ£À̽º´Â ±×´ë·Î À¯ÁöµË´Ï´Ù\n"
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr "ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ »õ·Î¿î µ¥ÀÌÅͺ£À̽º·Î ±³Ã¼Çϴµ¥ ½ÇÆÐÇß½À´Ï´Ù!\n"
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "º¹±¸Çϱâ À§ÇØ %2$sÀÇ ÆÄÀÏÀ» %1$sÀÇ ÆÄÀÏ·Î ±³Ã¼ÇÕ´Ï´Ù"
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, c-format
msgid "removing directory %s\n"
msgstr "%s µð·ºÅ丮¸¦ »èÁ¦ÇÕ´Ï´Ù\n"
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "%s µð·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆÐÇÔ: %s\n"
diff --git a/po/no.po b/po/no.po
index 6d9c32108..c0b75fce4 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -115,7 +115,7 @@ msgstr "<kmd>"
msgid "use <dir> as the top level directory"
msgstr "bruk <katalog> som toppnivåkatalog"
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr "<kat>"
@@ -396,40 +396,40 @@ msgstr ""
msgid "exec failed\n"
msgstr "kjøring feilet\n"
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr "ingen pakkefiler oppgitt for ombygging"
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr "ingen spec-fil oppgitt for bygging"
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr "ingen tar-fil oppgitt for bygging"
-#: rpmqv.c:1061
+#: rpmqv.c:1063
#, fuzzy
msgid "no packages given for erase"
msgstr "ingen pakker oppgitt for installering"
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr "ingen pakker oppgitt for installering"
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr "ingen argumenter oppgitt for spørring"
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr "ingen argumenter oppgitt for verifisering"
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr "uventede argumenter til --querytags "
-#: rpmqv.c:1155
+#: rpmqv.c:1157
#, fuzzy
msgid "no arguments given"
msgstr "ingen argumenter oppgitt for spørring"
@@ -1604,41 +1604,42 @@ msgstr "kan ikke skrive til %%%s %s\n"
msgid "error creating temporary file %s\n"
msgstr "feil under oppretting av midlertidig fil %s\n"
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead feilet\n"
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature feilet\n"
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen signatur tilgjengelig\n"
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead feilet\n"
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread feilet: %s\n"
@@ -1734,7 +1735,7 @@ msgstr "forkortning for --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "oppgrader pakke(r) hvis allerede installert"
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
msgid "<packagefile>+"
msgstr "<pakkefil>+"
@@ -1799,41 +1800,46 @@ msgstr "ikke kjør %%preun skriptlet (hvis noen)"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "ikke kjør %%postun skriptlet (hvis noen)"
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "ikke verifiser pakkeavhengigheter"
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "ikke verifiser pakkearkitektur"
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
#, fuzzy
msgid "don't verify package signature(s)"
msgstr "verifiser pakkesignatur"
-#: lib/poptI.c:197
+#: lib/poptI.c:199
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "Ikke kjør noen skriptlets som utløses av denne pakken"
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "ikke kjør %%triggerprein skriptlets"
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "ikke kjør %%triggerin skriptlets"
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "ikke kjør %%triggerun skriplets"
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "ikke kjør %%triggerpostun skriptlets"
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1841,48 +1847,48 @@ msgstr ""
"oppgrader til en gammel versjon av pakken (--force ved oppgraderinger gjør "
"dette automatisk)"
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr "skriv ut prosentvis fremgang etter som pakken installeres"
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr "omplasser pakken til <kat>, hvis den er omplasserbar"
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr "omplasser filer fra sti <gml> til <ny>"
-#: lib/poptI.c:223
+#: lib/poptI.c:225
msgid "<old>=<new>"
msgstr "<gml>=<ny>"
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr "lagre slettede pakkefiler ved ompakking"
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr "installer selv om pakken erstatter installerte filer"
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr "reinstaller selv om pakken allerede er installert"
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
#, fuzzy
msgid "<date>"
msgstr "<sti>"
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr "ikke installer, men si ifra om det ville virke eller ikke"
-#: lib/poptI.c:240
+#: lib/poptI.c:242
msgid "upgrade package(s)"
msgstr "oppgrader pakke(r)"
@@ -2011,76 +2017,76 @@ msgstr ""
msgid "display a verbose file listing"
msgstr ""
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
msgid "don't verify MD5 digest of files"
msgstr ""
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
msgid "don't verify size of files"
msgstr "ikke verifiser størrelse på filer"
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
msgid "don't verify symlink path of files"
msgstr "ikke verifiser sti til symbolske lenker for filer"
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
msgid "don't verify owner of files"
msgstr "ikke verifiser eier av filer"
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
msgid "don't verify group of files"
msgstr "ikke verifiser gruppe for filer"
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr "ikke verifisert endringsdato for filer"
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
msgid "don't verify mode of files"
msgstr "ikke verifiser modus for filer"
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr "ikke verifiser filer i pakke"
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr "ikke verifiser pakkeavhengigheter"
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "ikke kjør %verifyscript (hvis noen)"
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "ikke verifiser header SHA1 digest"
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr ""
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
#, fuzzy
msgid "sign package(s) (identical to --resign)"
msgstr "signer en pakke (forkast nåværende signatur)"
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
#, fuzzy
msgid "verify package signature(s)"
msgstr "verifiser pakkesignatur"
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
#, fuzzy
msgid "sign package(s) (identical to --addsign)"
msgstr "signer en pakke (forkast nåværende signatur)"
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
msgid "generate signature"
msgstr "generer signatur"
@@ -2153,7 +2159,7 @@ msgstr "klarte ikke å åpne %s: %s\n"
msgid "%s failed: %s\n"
msgstr "%s feilet\n"
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr "ukorrekt format: %s\n"
@@ -2202,8 +2208,8 @@ msgstr "pakken har verken fileier eller id-lister\n"
msgid "can't query %s: %s\n"
msgstr "kan ikke spørre på %s: %s\n"
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr "feil under åpning av %s: %s\n"
@@ -2217,7 +2223,7 @@ msgstr "spørring på %s feilet\n"
msgid "old format source packages cannot be queried\n"
msgstr "kildepakker i gammelt format kan ikke spørres\n"
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "ingen pakke utløser %s\n"
@@ -2286,7 +2292,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr "pakke %s er ikke installert\n"
@@ -2456,83 +2462,83 @@ msgstr "Forbereder..."
msgid "Preparing packages for installation..."
msgstr "Forbereder pakker for installasjon..."
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr "Henter %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr " ... som %s\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "hopper over %s - overføring feilet - %s\n"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr "pakke %s kan ikke relokeres\n"
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr "feil under lesing fra fil %s\n"
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "fil %s trenger en nyere versjon av RPM\n"
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "fant %d kilde- og %d binærpakker\n"
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "feilede avhengigheter:\n"
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr "installerer binærpakker\n"
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" spesifiserer flere pakker\n"
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan ikke åpne %s: %s\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr "Installerer %s\n"
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2749,13 +2755,13 @@ msgstr "Kunne ikke åpne spec fil %s: %s\n"
msgid "cannot open Packages database in %s\n"
msgstr "kan ikke åpne pakkedatabase i %s\n"
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, fuzzy, c-format
msgid "cannot open Solve database in %s\n"
msgstr "kan ikke åpne database i %s\n"
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr "henter liste over monterte filsystemer\n"
@@ -2959,11 +2965,11 @@ msgid "install/erase %d elements\n"
msgstr ""
#: lib/verify.c:288
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+msgid "missing %c %s"
msgstr "mangler %s"
-#: lib/verify.c:389
+#: lib/verify.c:395
#, fuzzy, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr "feilede avhengigheter:\n"
@@ -3139,164 +3145,179 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr "generer headere som er kompatible med (gamle) rpm[23] pakker"
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "kan ikke åpne %s-indeks ved bruk av db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, c-format
msgid "cannot open %s index\n"
msgstr "kan ikke åpne %s indeks\n"
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, 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:2033
+#: rpmdb/rpmdb.c:2127
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "h#%6u: already checked.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2136
+#, fuzzy, c-format
+msgid "h#%6u: %s"
+msgstr "%s: %s\n"
+
+#: rpmdb/rpmdb.c:2142
+#, c-format
+msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2365
+#: rpmdb/rpmdb.c:2500
#, 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:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, 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:2533
+#: rpmdb/rpmdb.c:2668
#, 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:2543
+#: rpmdb/rpmdb.c:2678
#, 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:2690
+#: rpmdb/rpmdb.c:2827
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, 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:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 2e1483bcf..4162cb44c 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -122,7 +122,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "u¿yj <katalogu> jako katalogu najwy¿szego poziomu"
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -410,40 +410,40 @@ msgstr "--sign mo¿na u¿yæ tylko w trakcie budowania pakietu"
msgid "exec failed\n"
msgstr "wykonanie nie powiod³o siê\n"
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr "nie podano nazw pakietów do przebudowania"
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr "nie podano nazw plików spec do budowania"
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr "nie podano nazw plików tar do budowania"
-#: rpmqv.c:1061
+#: rpmqv.c:1063
#, fuzzy
msgid "no packages given for erase"
msgstr "nie podano nazw plików do zainstalowania"
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr "nie podano nazw plików do zainstalowania"
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr "nie podano argumentów dla trybu zapytañ"
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr "nie podano argumentów dla sprawdzania"
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr "nieoczekiwane argumenty dla --querytags "
-#: rpmqv.c:1155
+#: rpmqv.c:1157
#, fuzzy
msgid "no arguments given"
msgstr "nie podano argumentów dla trybu zapytañ"
@@ -1648,45 +1648,46 @@ msgstr "nie mo¿na zapisaæ do %s"
msgid "error creating temporary file %s\n"
msgstr "b³±d w tworzeniu pliku tymczasowego %s"
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead nie powiod³o siê\n"
-#: lib/package.c:237
+#: lib/package.c:593
#, fuzzy
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
"tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a"
-#: lib/package.c:245
+#: lib/package.c:601
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
"tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a"
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature nie powiod³o siê\n"
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Sygnatura nie jest dostêpna\n"
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead nie powiod³o siê\n"
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead nie powiod³o siê\n"
@@ -1788,7 +1789,7 @@ msgstr "skrócona wersja kombinacji --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany"
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
#, fuzzy
msgid "<packagefile>+"
msgstr " -p <nazwa pakietu>+ "
@@ -1854,42 +1855,47 @@ msgstr "nie wykonuj ¿adnych etapów"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "nie wykonuj ¿adnych etapów"
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "nie sprawdzaj zale¿no¶ci pakietu"
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "nie sprawdzaj architektury systemu"
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
#, fuzzy
msgid "don't verify package signature(s)"
msgstr "sprawd¼ sygnaturê pakietu"
-#: lib/poptI.c:197
+#: lib/poptI.c:199
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "odpytywanie pakietów zahaczanych przez pakiet"
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "nie wykonuj ¿adnych skryptów instalacyjnych"
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "nie wykonuj ¿adnych skryptów instalacyjnych"
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "nie wykonuj ¿adnych skryptów instalacyjnych"
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "nie wykonuj ¿adnych skryptów instalacyjnych"
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1897,49 +1903,49 @@ msgstr ""
"uaktualnij do starej wersji (--force robi to samo automatycznie podczas "
"uaktualniania)"
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr "wy¶wietlaj stan instalacji w procentach"
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr "przesuñ pliki pakietu do drzewa <katalog>, je¶li jest przesuwalny"
-#: lib/poptI.c:222
+#: lib/poptI.c:224
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "przesuñ pliki z drzewa <stara-¶cie¿ka> do drzewa <nowa-¶cie¿ka>"
-#: lib/poptI.c:223
+#: lib/poptI.c:225
#, fuzzy
msgid "<old>=<new>"
msgstr " --relocate <stara-¶cie¿ka>=<nowa-¶cie¿ka>"
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr "instaluj nawet gdy pakiet zastêpuje inne zainstalowane pliki"
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr "przeinstaluj je¶li pakiet jest ju¿ zainstalowany"
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr "nie instaluj, podaj tylko czy instalacja zadzia³a czy nie"
-#: lib/poptI.c:240
+#: lib/poptI.c:242
#, fuzzy
msgid "upgrade package(s)"
msgstr " --upgrade <nazwa pakietu>"
@@ -2079,84 +2085,84 @@ msgstr "wy¶wietl status pokazywanych plików"
msgid "display a verbose file listing"
msgstr "wy¶wietl wiêcej informacji o plikach z listy"
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
#, fuzzy
msgid "don't verify MD5 digest of files"
msgstr "nie sprawdzaj plików pakietu"
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
#, fuzzy
msgid "don't verify size of files"
msgstr "nie sprawdzaj plików pakietu"
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
#, fuzzy
msgid "don't verify symlink path of files"
msgstr "nie sprawdzaj plików pakietu"
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
#, fuzzy
msgid "don't verify owner of files"
msgstr "nie sprawdzaj plików pakietu"
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
#, fuzzy
msgid "don't verify group of files"
msgstr "nie sprawdzaj plików pakietu"
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
#, fuzzy
msgid "don't verify mode of files"
msgstr "nie sprawdzaj plików pakietu"
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr "nie sprawdzaj plików pakietu"
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
#, fuzzy
msgid "don't verify package dependencies"
msgstr "nie sprawdzaj zale¿no¶ci pakietu"
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "nie wykonuj ¿adnych etapów"
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "nie sprawdzaj plików pakietu"
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "nie sprawdzaj plików pakietu"
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
#, fuzzy
msgid "sign package(s) (identical to --resign)"
msgstr "podpisz pakiet (porzuæ bierz±c± sygnaturê)"
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
#, fuzzy
msgid "verify package signature(s)"
msgstr "sprawd¼ sygnaturê pakietu"
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
#, fuzzy
msgid "sign package(s) (identical to --addsign)"
msgstr "podpisz pakiet (porzuæ bierz±c± sygnaturê)"
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
#, fuzzy
msgid "generate signature"
msgstr "generuj sygnaturê PGP/GPG"
@@ -2232,7 +2238,7 @@ msgstr "nie mo¿na otworzyæ %s: %s"
msgid "%s failed: %s\n"
msgstr "%s nie powiod³o siê"
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "b³±d w formacie: %s\n"
@@ -2282,8 +2288,8 @@ msgstr "pakiet nie ma ani w³a¶ciciela pliku ani list id"
msgid "can't query %s: %s\n"
msgstr "nie mo¿na odwi±zaæ %s: %s\n"
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr "otwarcie %s nie powiod³o siê: %s\n"
@@ -2297,7 +2303,7 @@ msgstr "odpytywanie %s nie powiod³o siê\n"
msgid "old format source packages cannot be queried\n"
msgstr "pakiety w starym formacie nie mog± byæ odpytywane\n"
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "¿aden pakiet nie zahacza %s\n"
@@ -2367,7 +2373,7 @@ msgstr "numer rekordu pakietu: %d\n"
msgid "record %u could not be read\n"
msgstr "nie mo¿na odczytaæ rekordu %d\n"
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr "pakiet %s nie jest zainstalowany\n"
@@ -2541,83 +2547,83 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "nie podano nazw plików do zainstalowania"
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr "¦ci±ganie %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr "... jako %s\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s pomijany - transmisja %s nie powiod³a siê\n"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr "pakiet %s nie jest przesuwalny\n"
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr "b³±d czytania z pliku %s\n"
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "plik %s wymaga nowszej wersji RPM\n"
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nie mo¿e byæ zainstalowany\n"
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "znaleziono %d pakietów ¼ród³owych i %d binarnych\n"
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "niespe³nione zale¿no¶ci:\n"
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr "instalacja pakietów binarnych\n"
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "nie mo¿na otworzyæ pliku %s: %s"
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" okre¶la wiele pakietów\n"
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "nie mo¿na otworzyæ %s\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr "Instalacja %s\n"
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2836,13 +2842,13 @@ msgstr "Nie mo¿na otworzyæ %s do odczytu: %s."
msgid "cannot open Packages database in %s\n"
msgstr "nie mo¿na otworzyæ %s/packages.rpm\n"
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, fuzzy, c-format
msgid "cannot open Solve database in %s\n"
msgstr "nie mo¿na otworzyæ %s/packages.rpm\n"
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -3055,10 +3061,10 @@ msgstr ""
#: lib/verify.c:288
#, fuzzy, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr "brak %s\n"
-#: lib/verify.c:389
+#: lib/verify.c:395
#, fuzzy, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: "
@@ -3237,166 +3243,181 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, fuzzy, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "nie mo¿na otworzyæ %s przy %s:%d"
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, fuzzy, c-format
msgid "cannot open %s index\n"
msgstr "nie mo¿na otworzyæ %s\n"
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
#, fuzzy
msgid "no dbpath has been set\n"
msgstr "¶cie¿ka bazy danych nie zosta³a podana"
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "b³±d pobierania rekordu %s z %s"
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, fuzzy, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "b³±d zapisywania rekordu %s do %s"
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
+#, c-format
+msgid "h#%6u: already checked.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2136
+#, fuzzy, c-format
+msgid "h#%6u: %s"
+msgstr "plik %s: %s\n"
+
+#: rpmdb/rpmdb.c:2142
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "rpmdb: header #%u: %s -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, 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:2365
+#: rpmdb/rpmdb.c:2500
#, 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:2480
+#: rpmdb/rpmdb.c:2615
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "usuwanie indeksu grupy\n"
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "usuwanie indeksu nazw\n"
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "b³±d pobierania rekordu %s z %s"
-#: rpmdb/rpmdb.c:2533
+#: rpmdb/rpmdb.c:2668
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "b³±d zapisywania rekordu %s do %s"
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "b³±d usuwania rekordu %s z %s"
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "b³±d szukania pakietu %s\n"
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "zmiana nazwy %s na %s\n"
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "zmiana nazwy %s na %s\n"
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "b³±d zapisywania rekordu %s do %s"
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr "¶cie¿ka bazy danych nie zosta³a podana"
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "odbudowywujê bazê danych w rootdir %s\n"
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "tymczasowa baza danych %s ju¿ istnieje"
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "tworzenie katalogu: %s\n"
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "tworzenie katalogu: %s\n"
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "otwieranie starej bazy danych\n"
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "otwieranie nowej bazy danych\n"
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, fuzzy, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+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:3464
+#: rpmdb/rpmdb.c:3605
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "nie mo¿na dodaæ rekordu oryginalnie przy %d"
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
#, 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:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr "zamiana starej bazy na now± nie powiod³a siê!\n"
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, 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:3502
+#: rpmdb/rpmdb.c:3643
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "tworzenie katalogu: %s\n"
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n"
diff --git a/po/pt.po b/po/pt.po
index 573e55d85..89e6fb800 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2002-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -115,7 +115,7 @@ msgstr "<com>"
msgid "use <dir> as the top level directory"
msgstr "usa <dir> como a directoria de topo"
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr "<dir>"
@@ -405,39 +405,39 @@ msgstr "o --sign só pode ser usado na criação do pacote"
msgid "exec failed\n"
msgstr "o exec falhou\n"
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr "não foram indicados pacotes para a reconstrução"
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr "não foram indicados ficheiros spec para a criação"
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr "não foram indicados ficheiros tar para a criação"
-#: rpmqv.c:1061
+#: rpmqv.c:1063
msgid "no packages given for erase"
msgstr "não foram indicados pacotes para apagar"
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr "não foram indicados pacotes para instalar"
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr "não foram indicados argumentos para a pesquisa"
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr "não foram indicados argumentos para a verificação"
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr "argumentos inesperados no --querytags "
-#: rpmqv.c:1155
+#: rpmqv.c:1157
#, fuzzy
msgid "no arguments given"
msgstr "não foram indicados argumentos para a pesquisa"
@@ -1622,41 +1622,42 @@ msgstr "não consigo escrever em %%%s %s\n"
msgid "error creating temporary file %s\n"
msgstr "erro ao criar o ficheiro temporário %s\n"
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr ":%s: o readLead falhou\n"
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "a versão 1 dos pacotes não é suportada por esta versão do RPM\n"
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "só os pacotes com versão <= 4 são suportados por esta versão do RPM\n"
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: o rpmReadSignature falhou\n"
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Nenhuma assinatura disponível\n"
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr ":%s: o readLead falhou\n"
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: O fread falhou: %s\n"
@@ -1755,7 +1756,7 @@ msgstr "abreviatura para --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "actualizar o pacote(s) se já estiver instalado"
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
msgid "<packagefile>+"
msgstr "<pacote>+"
@@ -1821,41 +1822,46 @@ msgstr "não executar o script %%preun (se existir)"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "não executar o script %%postun (se existir)"
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "não verificar as dependências do pacote"
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "não verifica a arquitectura do pacote"
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
#, fuzzy
msgid "don't verify package signature(s)"
msgstr "verificar a assinatura do pacote"
-#: lib/poptI.c:197
+#: lib/poptI.c:199
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "não executar nenhum dos scripts activados por este pacote"
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "não executar nenhum dos scripts %%triggerprein"
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "não executar nenhum dos scripts %%triggerin"
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "não executar nenhum dos scripts %%triggerun"
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "não executar nenhum dos scripts %%triggerpostun"
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1863,47 +1869,47 @@ msgstr ""
"actualiza para um versão antiga do pacote (o --force faz isto "
"automaticamente)"
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr "mostra percentagens enquanto o pacote instala"
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr "muda o pacote para <dir>, se for possível"
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr "muda os ficheiros de <velho> para <novo>"
-#: lib/poptI.c:223
+#: lib/poptI.c:225
msgid "<old>=<new>"
msgstr "<velho>=<novo>"
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr "gravar ficheiros apagados reempacotando-os"
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr "instala mesmo se o pacote substituir ficheiros instalados"
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr "reinstalar se o pacote já estiver presente"
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr "desinstalador novo, reinstalar velho, pacote(s) voltar à <data>"
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr "<data>"
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr "não instala, mas indica se iria funcionar ou não"
-#: lib/poptI.c:240
+#: lib/poptI.c:242
msgid "upgrade package(s)"
msgstr "actualizar pacote(s)"
@@ -2029,77 +2035,77 @@ msgstr "mostrar os estados dos ficheiros listados"
msgid "display a verbose file listing"
msgstr "mostrar uma listagem descritiva do ficheiro"
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
msgid "don't verify MD5 digest of files"
msgstr "não verificar o MD5 dos ficheiros"
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
msgid "don't verify size of files"
msgstr "não verificar os tamanho dos ficheiros"
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
msgid "don't verify symlink path of files"
msgstr "não verificar as ligações simbólicas dos ficheiros"
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
msgid "don't verify owner of files"
msgstr "não verificar o dono dos ficheiros"
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
msgid "don't verify group of files"
msgstr "não verificar o grupo dos ficheiros"
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr "não verificar hora de modificação dos ficheiros"
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
msgid "don't verify mode of files"
msgstr "não verificar o modo dos ficheiros"
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr "não verificar os ficheiros no pacote"
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr "não verificar as dependências do pacote"
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "não executar o %verifyscript (se existir)"
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "não verificar o SHA1 do cabeçalho"
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "não verificar o MD5 dos ficheiros"
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
#, fuzzy
msgid "sign package(s) (identical to --resign)"
msgstr "assinar um pacote (retira a assinatura actual)"
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
#, fuzzy
msgid "verify package signature(s)"
msgstr "verificar a assinatura do pacote"
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
#, fuzzy
msgid "sign package(s) (identical to --addsign)"
msgstr "assinar um pacote (retira a assinatura actual)"
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
msgid "generate signature"
msgstr "gerar a assinatura"
@@ -2174,7 +2180,7 @@ msgstr "%s falhou no ficheiro %s: %s\n"
msgid "%s failed: %s\n"
msgstr "%s falhou: %s\n"
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr "formato incorrecto: %s\n"
@@ -2223,8 +2229,8 @@ msgstr "o pacote nem tem um dono do ficheiro ou as listas de IDs\n"
msgid "can't query %s: %s\n"
msgstr "não consigo pesquisar o %s: %s\n"
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr "o acesso ao %s falhou: %s\n"
@@ -2239,7 +2245,7 @@ msgid "old format source packages cannot be queried\n"
msgstr ""
"os pacotes com código-fonte no formato antigo não podem ser pesquisados\n"
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "nenhum pacote coincide com %s: %s\n"
@@ -2308,7 +2314,7 @@ msgstr "número de registo do pacote: %u\n"
msgid "record %u could not be read\n"
msgstr "o registo %u não pôde ser lido\n"
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr "o pacote %s não está instalado\n"
@@ -2482,83 +2488,83 @@ msgstr "A preparar..."
msgid "Preparing packages for installation..."
msgstr "A preparar os pacotes para a instalação..."
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr "A obter o %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr " ... como %s\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "a ignorar o %s - a transferência falhou - %s\n"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr "o pacote %s não pode ser mudado de sítio\n"
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr "erro ao ler do ficheiros %s\n"
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "o %s precisa duma versão mais recente do RPM\n"
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr "o %s não pode ser instalado\n"
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "encontrados %d pacotes com código-fonte e %d binários\n"
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "dependências falhadas:\n"
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr "a instalar os pacotes binários\n"
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "não consigo aceder ao ficheiro %s: %s\n"
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "o \"%s\" especifica vários pacotes\n"
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, c-format
msgid "cannot open %s: %s\n"
msgstr "não consigo aceder ao %s: %s\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr "A instalar o %s\n"
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "a efectuar o 'rollback' (+%d,-%d) pacotes para %s"
@@ -2779,13 +2785,13 @@ msgstr "Não consegui abrir o %s para leitura: %s.\n"
msgid "cannot open Packages database in %s\n"
msgstr "não consigo abrir a base de dados Packages em %s\n"
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, fuzzy, c-format
msgid "cannot open Solve database in %s\n"
msgstr "não consigo a base de dados do RPM em %s\n"
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -2991,11 +2997,11 @@ msgid "install/erase %d elements\n"
msgstr ""
#: lib/verify.c:288
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+msgid "missing %c %s"
msgstr "falta %s"
-#: lib/verify.c:389
+#: lib/verify.c:395
#, fuzzy, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr "Dependências não satisfeitas para o %s-%s-%s: "
@@ -3173,165 +3179,180 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr "gerar os cabeçalhos compatíveis com o formato do rpm[23]"
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: nome de opção não reconhecido: \"%s\" ignorado\n"
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "não consigo abrir o índice de %s usando o db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, c-format
msgid "cannot open %s index\n"
msgstr "não consigo abrir o índice do %s\n"
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr "não foi definido o dbpath\n"
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, 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:1449
+#: rpmdb/rpmdb.c:1527
#, 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:2033
+#: rpmdb/rpmdb.c:2127
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "h#%6u: already checked.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2136
+#, fuzzy, c-format
+msgid "h#%6u: %s"
+msgstr "%s: %s\n"
+
+#: rpmdb/rpmdb.c:2142
+#, fuzzy, c-format
+msgid "rpmdb: header #%u: %s -- skipping.\n"
msgstr "rpmdb: recebida instância do cabeçalho #%u estragada, a ignorar.\n"
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2163
+#, 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:2437
#, 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:2365
+#: rpmdb/rpmdb.c:2500
#, 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:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "a remover o \"%s\" do índice %s.\n"
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "a remover %d registos do índice %s.\n"
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, 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:2533
+#: rpmdb/rpmdb.c:2668
#, 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:2543
+#: rpmdb/rpmdb.c:2678
#, 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:2690
+#: rpmdb/rpmdb.c:2827
#, 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:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "a adicionar o \"%s\" ao índice %s.\n"
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "a adicionar %d registos ao índice %s.\n"
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, 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:3297
+#: rpmdb/rpmdb.c:3434
#, 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:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr "não foi definido o dbpath"
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "a reconstruir a base de dados %s em %s\n"
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr "A base de dados temporária %s já existe\n"
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, c-format
msgid "creating directory %s\n"
msgstr "a criar a directoria %s\n"
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, c-format
msgid "creating directory %s: %s\n"
msgstr "a criar a directoria %s: %s\n"
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, 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:3398
+#: rpmdb/rpmdb.c:3536
#, 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:3424
-#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+#: rpmdb/rpmdb.c:3565
+#, 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:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "não consigo adicionar o registo originalmente em %u\n"
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
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:3490
+#: rpmdb/rpmdb.c:3631
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:3492
+#: rpmdb/rpmdb.c:3633
#, 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:3502
+#: rpmdb/rpmdb.c:3643
#, c-format
msgid "removing directory %s\n"
msgstr "a remover a directoria %s\n"
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "falhou a remoção da directoria %s: %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index cd5b0c8a6..1ab426029 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-0400\n"
#: build.c:40
#, fuzzy
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "use <diretrio> como diretrio raiz"
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -437,40 +437,40 @@ msgstr "--sign somente pode ser usado durante a construo de pacotes"
msgid "exec failed\n"
msgstr "Construo falhou.\n"
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr "no foram passados pacotes para reconstruo"
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr "no foi passado arquivo spec para construo"
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr "no foram passados arquivos tar para construo"
-#: rpmqv.c:1061
+#: rpmqv.c:1063
#, fuzzy
msgid "no packages given for erase"
msgstr "no foi passado pacote para instalao"
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr "no foi passado pacote para instalao"
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr "no foi passado argumento para pesquisa"
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr "no foi passado argumento para verificao"
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr "argumentos no esperados em --querytags"
-#: rpmqv.c:1155
+#: rpmqv.c:1157
#, fuzzy
msgid "no arguments given"
msgstr "no foi passado argumento para pesquisa"
@@ -1768,43 +1768,44 @@ msgstr "No consegui abrir: %s\n"
msgid "error creating temporary file %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr ""
# , c-format
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "No consegui abrir: %s\n"
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
# , c-format
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "No consegui abrir: %s\n"
@@ -1905,7 +1906,7 @@ msgstr "alis para --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "no foi passado pacote para instalao"
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
#, fuzzy
msgid "<packagefile>+"
msgstr " -b<estgio> <spec> "
@@ -1973,42 +1974,47 @@ msgstr "no execute nenhum estgio"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "no execute nenhum estgio"
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "no verifique as dependncias do pacote"
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "no verifique a arquitetura do pacote"
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
#, fuzzy
msgid "don't verify package signature(s)"
msgstr "verifique a assinatura do pacote"
-#: lib/poptI.c:197
+#: lib/poptI.c:199
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "pesquise o pacote ao qual <arquivo> pertence"
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "no execute nenhuma script especfica do pacote"
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "no execute nenhuma script de instalao"
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "no execute nenhuma script de instalao"
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "no execute nenhuma script de instalao"
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2016,48 +2022,48 @@ msgstr ""
"atualize para uma verso mais velha do pacote (--force em atualizaes no faz "
"isto automaticamente)"
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr "imprima porcentagens a medida que o pacote vai sendo instalado"
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr "realoque o pacote para <diretrio>, se realocvel"
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:223
+#: lib/poptI.c:225
#, fuzzy
msgid "<old>=<new>"
msgstr " [--nomd5] [alvos]"
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr "instale mesmo que o pacote substitua arquivos j instalados"
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr "reinstale se o pacote j estiver presente"
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr "no instale, mas diga se a instalao funcionar ou no"
-#: lib/poptI.c:240
+#: lib/poptI.c:242
#, fuzzy
msgid "upgrade package(s)"
msgstr "instale pacote"
@@ -2205,85 +2211,85 @@ msgstr ""
msgid "display a verbose file listing"
msgstr "mostre a lista de arquivos do pacote"
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
#, fuzzy
msgid "don't verify MD5 digest of files"
msgstr "instale pacote"
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
#, fuzzy
msgid "don't verify size of files"
msgstr "instale pacote"
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
#, fuzzy
msgid "don't verify symlink path of files"
msgstr "instale pacote"
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
#, fuzzy
msgid "don't verify owner of files"
msgstr "instale pacote"
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
#, fuzzy
msgid "don't verify group of files"
msgstr "instale pacote"
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
#, fuzzy
msgid "don't verify mode of files"
msgstr "instale pacote"
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
#, fuzzy
msgid "don't verify files in package"
msgstr "instale pacote"
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
#, fuzzy
msgid "don't verify package dependencies"
msgstr "no verifique as dependncias do pacote"
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "no execute nenhum estgio"
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "instale pacote"
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "instale pacote"
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
#, fuzzy
msgid "sign package(s) (identical to --resign)"
msgstr "assine um pacote (descarte a assinatura corrente)"
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
#, fuzzy
msgid "verify package signature(s)"
msgstr "verifique a assinatura do pacote"
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
#, fuzzy
msgid "sign package(s) (identical to --addsign)"
msgstr "assine um pacote (descarte a assinatura corrente)"
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
#, fuzzy
msgid "generate signature"
msgstr "gere assinatura PGP"
@@ -2359,7 +2365,7 @@ msgstr "No consegui abrir: %s\n"
msgid "%s failed: %s\n"
msgstr "Construo falhou.\n"
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
@@ -2411,8 +2417,8 @@ msgstr "no foi passado pacote para instalao"
msgid "can't query %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "Construo falhou.\n"
@@ -2426,7 +2432,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "no foram passados pacotes para assinatura"
@@ -2497,7 +2503,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, fuzzy, c-format
msgid "package %s is not installed\n"
msgstr "no foi passado pacote para instalao"
@@ -2712,86 +2718,86 @@ msgstr "no foi passado pacote para instalao"
# "Content-Type: text/plain; charset=ISO-8859-1\n"
# "Content-Transfer-Encoding: 8-bit\n"
# , c-format
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, fuzzy, c-format
msgid "Retrieving %s\n"
msgstr "RPM verso %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "no foi passado pacote para instalao"
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "no foi passado pacote para instalao"
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "lista dependncias do pacote"
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
#, fuzzy
msgid "installing binary packages\n"
msgstr "instale pacote"
# , c-format
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
# , c-format
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "no foi passado pacote para desinstalao"
@@ -3017,13 +3023,13 @@ msgid "cannot open Packages database in %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, fuzzy, c-format
msgid "cannot open Solve database in %s\n"
msgstr "No consegui abrir: %s\n"
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -3243,10 +3249,10 @@ msgstr ""
#: lib/verify.c:288
#, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:389
+#: lib/verify.c:395
#, fuzzy, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr "lista dependncias do pacote"
@@ -3426,167 +3432,183 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
# , c-format
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, fuzzy, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, fuzzy, c-format
msgid "cannot open %s index\n"
msgstr "No consegui abrir: %s\n"
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr ""
# , c-format
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, fuzzy, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, fuzzy, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "No consegui abrir: %s\n"
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
+#, c-format
+msgid "h#%6u: already checked.\n"
+msgstr ""
+
+# , c-format
+#: rpmdb/rpmdb.c:2136
+#, fuzzy, c-format
+msgid "h#%6u: %s"
+msgstr "No consegui ler o arquivo spec de %s\n"
+
+#: rpmdb/rpmdb.c:2142
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "rpmdb: header #%u: %s -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, fuzzy, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "no foi passado pacote para desinstalao"
# , c-format
-#: rpmdb/rpmdb.c:2365
+#: rpmdb/rpmdb.c:2500
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "No consegui abrir: %s\n"
-#: rpmdb/rpmdb.c:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
# , c-format
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: rpmdb/rpmdb.c:2533
+#: rpmdb/rpmdb.c:2668
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "No consegui abrir: %s\n"
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "no foi passado pacote para instalao"
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
# , c-format
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "No consegui abrir: %s\n"
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, 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:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
# , c-format
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "No consegui abrir: %s\n"
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, 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:3398
+#: rpmdb/rpmdb.c:3536
#, 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:3424
+#: rpmdb/rpmdb.c:3565
#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
@@ -3599,13 +3621,13 @@ msgstr ""
# "Content-Type: text/plain; charset=ISO-8859-1\n"
# "Content-Transfer-Encoding: 8-bit\n"
# , c-format
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "RPM verso %s\n"
# , c-format
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "No consegui abrir: %s\n"
diff --git a/po/ro.po b/po/ro.po
index 53db21fd7..2b43eaa3b 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -113,7 +113,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -387,39 +387,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1063
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1157
msgid "no arguments given"
msgstr ""
@@ -1579,41 +1579,42 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -1706,7 +1707,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
msgid "<packagefile>+"
msgstr ""
@@ -1770,85 +1771,89 @@ msgstr ""
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:199
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:223
+#: lib/poptI.c:225
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:240
+#: lib/poptI.c:242
msgid "upgrade package(s)"
msgstr ""
@@ -1971,71 +1976,71 @@ msgstr ""
msgid "display a verbose file listing"
msgstr ""
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
msgid "don't verify MD5 digest of files"
msgstr ""
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
msgid "don't execute verify script(s)"
msgstr ""
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
msgid "don't verify GPG V3 DSA signature(s)"
msgstr ""
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr ""
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
msgid "sign package(s) (identical to --resign)"
msgstr ""
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
msgid "verify package signature(s)"
msgstr ""
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
msgid "sign package(s) (identical to --addsign)"
msgstr ""
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
msgid "generate signature"
msgstr ""
@@ -2108,7 +2113,7 @@ msgstr ""
msgid "%s failed: %s\n"
msgstr ""
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
@@ -2156,8 +2161,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2171,7 +2176,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2240,7 +2245,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2410,82 +2415,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2701,13 +2706,13 @@ msgstr ""
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, c-format
msgid "cannot open Solve database in %s\n"
msgstr ""
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -2909,10 +2914,10 @@ msgstr ""
#: lib/verify.c:288
#, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:389
+#: lib/verify.c:395
#, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr ""
@@ -3088,164 +3093,179 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr ""
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, c-format
msgid "cannot open %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "h#%6u: already checked.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2136
+#, c-format
+msgid "h#%6u: %s"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2142
+#, c-format
+msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2365
+#: rpmdb/rpmdb.c:2500
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2533
+#: rpmdb/rpmdb.c:2668
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index 979667eae..f8463ac93 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -119,7 +119,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -393,39 +393,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1063
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1157
msgid "no arguments given"
msgstr ""
@@ -1585,41 +1585,42 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -1712,7 +1713,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
msgid "<packagefile>+"
msgstr ""
@@ -1776,85 +1777,89 @@ msgstr ""
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:199
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:223
+#: lib/poptI.c:225
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:240
+#: lib/poptI.c:242
msgid "upgrade package(s)"
msgstr ""
@@ -1977,71 +1982,71 @@ msgstr ""
msgid "display a verbose file listing"
msgstr ""
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
msgid "don't verify MD5 digest of files"
msgstr ""
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
msgid "don't execute verify script(s)"
msgstr ""
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
msgid "don't verify GPG V3 DSA signature(s)"
msgstr ""
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr ""
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
msgid "sign package(s) (identical to --resign)"
msgstr ""
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
msgid "verify package signature(s)"
msgstr ""
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
msgid "sign package(s) (identical to --addsign)"
msgstr ""
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
msgid "generate signature"
msgstr ""
@@ -2114,7 +2119,7 @@ msgstr ""
msgid "%s failed: %s\n"
msgstr ""
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
@@ -2162,8 +2167,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2177,7 +2182,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2246,7 +2251,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2416,82 +2421,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2707,13 +2712,13 @@ msgstr ""
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, c-format
msgid "cannot open Solve database in %s\n"
msgstr ""
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -2915,10 +2920,10 @@ msgstr ""
#: lib/verify.c:288
#, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:389
+#: lib/verify.c:395
#, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr ""
@@ -3094,164 +3099,179 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr ""
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, c-format
msgid "cannot open %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "h#%6u: already checked.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2136
+#, c-format
+msgid "h#%6u: %s"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2142
+#, c-format
+msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2365
+#: rpmdb/rpmdb.c:2500
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2533
+#: rpmdb/rpmdb.c:2668
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index e08bd017f..62730689b 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -117,7 +117,7 @@ msgstr "<ËÏÍÁÎÄÁ>"
msgid "use <dir> as the top level directory"
msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <ËÁÔÁÌÏÇ> ËÁË ËÏÒÎÅ×ÏÊ ËÁÔÁÌÏÇ"
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr "<ËÁÔÁÌÏÇ>"
@@ -409,39 +409,39 @@ msgstr "--sign ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÔÏÌØËÏ ÐÒÉ ÓÂÏÒËÅ ÐÁËÅÔÏ×"
msgid "exec failed\n"
msgstr "ÚÁÐÕÓË ÎÅ ÕÄÁÌÓÑ\n"
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÐÅÒÅÓÂÏÒËÉ"
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr "ÎÅ ÚÁÄÁÎ ÆÁÊÌ ÓÐÅÃÉÆÉËÁÃÉÉ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÁ"
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr "ÎÅ ÚÁÄÁÎÙ tar-ÆÁÊÌÙ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÁ"
-#: rpmqv.c:1061
+#: rpmqv.c:1063
msgid "no packages given for erase"
msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÕÄÁÌÅÎÉÑ"
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ"
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÚÁÐÒÏÓÁ"
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÄÌÑ ×ÅÒÉÆÉËÁÃÉÉ"
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr "ÎÅÏÖÉÄÁÎÎÙÅ ÁÒÇÕÍÅÎÔÙ ÄÌÑ --querytags "
-#: rpmqv.c:1155
+#: rpmqv.c:1157
#, fuzzy
msgid "no arguments given"
msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÚÁÐÒÏÓÁ"
@@ -1627,41 +1627,42 @@ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÉÓÁÔØ × %%%s %s\n"
msgid "error creating temporary file %s\n"
msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ %s\n"
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: ÏÛÉÂËÁ readLead\n"
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "ÐÁËÅÔÙ ×ÅÒÓÉÉ 1 ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ ÜÔÏÊ ×ÅÒÓÉÅÊ RPM\n"
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ÐÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ÐÁËÅÔÙ ×ÅÒÓÉÉ <= 4\n"
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: ÏÛÉÂËÁ rpmReadSignature\n"
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: ðÏÄÐÉÓØ ÎÅÄÏÓÔÕÐÎÁ\n"
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: ÏÛÉÂËÁ readLead\n"
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: ÏÛÉÂËÁ Fread: %s\n"
@@ -1759,7 +1760,7 @@ msgstr "ÓÏËÒÁÝÅÎÉÅ ÄÌÑ --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "ÏÂÎÏ×ÉÔØ ÐÁËÅÔ(Ù) ÅÓÌÉ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
msgid "<packagefile>+"
msgstr "<ÆÁÊÌ ÐÁËÅÔÁ>+"
@@ -1824,41 +1825,46 @@ msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%preun ÓÃÅÎÁÒÉÅ× (ÅÓÌÉ ÅÓÔØ)"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%postun ÓÃÅÎÁÒÉÅ× (ÅÓÌÉ ÅÓÔØ)"
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÚÁ×ÉÓÉÍÏÓÔÉ ÐÁËÅÔÁ"
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÁÒÈÉÔÅËÔÕÒÕ ÐÁËÅÔÁ"
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
#, fuzzy
msgid "don't verify package signature(s)"
msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ × ÐÁËÅÔÅ"
-#: lib/poptI.c:197
+#: lib/poptI.c:199
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ÔÒÉÇÇÅÒ-ÓÃÅÎÁÒÉÅ×, ×Ú×ÅÄÅÎÎÙÈ ÜÔÉÍ ÐÁËÅÔÏÍ"
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%triggerprein ÓÃÅÎÁÒÉÅ×"
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%triggerin ÓÃÅÎÁÒÉÅ×"
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%triggerun ÓÃÅÎÁÒÉÅ×"
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %%triggerpostun ÓÃÅÎÁÒÉÅ×"
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1866,49 +1872,49 @@ msgstr ""
"ÏÔËÁÔ ÎÁ ÂÏÌÅÅ ÓÔÁÒÕÀ ×ÅÒÓÉÀ ÐÁËÅÔÁ (--force ÐÒÉ ÏÂÎÏ×ÌÅÎÉÉ ÄÅÌÁÅÔ ÜÔÏ "
"Á×ÔÏÍÁÔÉÞÅÓËÉ)"
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr "×Ù×ÏÄÉÔØ ÐÒÏÃÅÎÔ ÇÏÔÏ×ÎÏÓÔÉ ÐÏ ÍÅÒÅ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ"
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr "ÐÅÒÅÍÅÓÔÉÔØ ÐÁËÅÔ × <ËÁÔÁÌÏÇ>, ÅÓÌÉ ÐÁËÅÔ ÜÔÏ ÐÏÚ×ÏÌÑÅÔ"
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr "ÐÅÒÅÍÅÓÔÉÔØ ÆÁÊÌÙ ÉÚ ÐÕÔÉ <old> × <new>"
-#: lib/poptI.c:223
+#: lib/poptI.c:225
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr "ÓÏÈÒÁÎÉÔØ ÐÏÄÌÅÖÁÝÉÅ ÕÄÁÌÅÎÉÀ ÆÁÊÌÙ × ÎÏ×ÏÍ ÐÁËÅÔÅ"
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, ÄÁÖÅ ÅÓÌÉ ÐÁËÅÔ ÐÅÒÅÐÉÛÅÔ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎÎÙÅ ÆÁÊÌÙ"
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr "ÐÅÒÅÕÓÔÁÎÏ×ÉÔØ, ÅÓÌÉ ÐÁËÅÔ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
"ÕÄÁÌÉÔØ ÎÏ×ÙÊ(Å) ÐÁËÅÔ(Ù), ÐÅÒÅÕÓÔÁÎÏ×ÉÔØ ÓÔÁÒÙÊ(Å) ÐÁËÅÔ(Ù), ÏÂÒÁÔÎÏ ÎÁ "
"ÕËÁÚÁÎÎÕÀ ÄÁÔÕ"
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr "<ÄÁÔÁ>"
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr "ÎÅ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, Á ÔÏÌØËÏ ÓÏÏÂÝÉÔØ, ÕÄÁÓÔÓÑ ÌÉ ÕÓÔÁÎÏ×ËÁ"
-#: lib/poptI.c:240
+#: lib/poptI.c:242
msgid "upgrade package(s)"
msgstr "ÏÂÎÏ×ÉÔØ ÐÁËÅÔ(Ù)"
@@ -2033,77 +2039,77 @@ msgstr "ÐÏËÁÚÁÔØ ÓÏÓÔÏÑÎÉÅ ÐÅÒÅÞÉÓÌÅÎÎÙÈ ÆÁÊÌÏ×"
msgid "display a verbose file listing"
msgstr "ÐÏËÁÚÁÔØ ÄÅÔÁÌØÎÙÊ ÓÐÉÓÏË ÆÁÊÌÏ×"
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
msgid "don't verify MD5 digest of files"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÎÁ ËÏÎÔÒÏÌØÎÕÀ ÓÕÍÍÕ MD5"
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
msgid "don't verify size of files"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÒÁÚÍÅÒ ÆÁÊÌÏ×"
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
msgid "don't verify symlink path of files"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÐÕÔØ ÓÉÍ×ÏÌÉÞÅÓËÉÈ ÓÓÙÌÏË"
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
msgid "don't verify owner of files"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÈÏÚÑÉÎÁ ÆÁÊÌÏ×"
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
msgid "don't verify group of files"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÇÒÕÐÐÕ ÆÁÊÌÏ×"
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ×ÒÅÍÑ ÍÏÄÉÆÉËÁÃÉÉ ÆÁÊÌÏ×"
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
msgid "don't verify mode of files"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÐÒÁ×Á ÄÏÓÔÕÐÁ ÆÁÊÌÏ× ÐÁËÅÔÁ"
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÐÁËÅÔÁ"
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÚÁ×ÉÓÉÍÏÓÔÉ ÐÁËÅÔÁ"
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %verifyscript (ÅÓÌÉ ÅÓÔØ)"
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ËÏÎÔÒÏÌØÎÕÀ ÓÕÍÍÕ SHA1 ÚÁÇÏÌÏ×ËÁ ÐÁËÅÔÁ"
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÎÁ ËÏÎÔÒÏÌØÎÕÀ ÓÕÍÍÕ MD5"
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
#, fuzzy
msgid "sign package(s) (identical to --resign)"
msgstr "ÐÏÄÐÉÓÁÔØ ÐÁËÅÔ (ÕÄÁÌÉ× ÔÅËÕÝÕÀ ÐÏÄÐÉÓØ)"
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
#, fuzzy
msgid "verify package signature(s)"
msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ × ÐÁËÅÔÅ"
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
#, fuzzy
msgid "sign package(s) (identical to --addsign)"
msgstr "ÐÏÄÐÉÓÁÔØ ÐÁËÅÔ (ÕÄÁÌÉ× ÔÅËÕÝÕÀ ÐÏÄÐÉÓØ)"
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
msgid "generate signature"
msgstr "ÇÅÎÅÒÉÒÏ×ÁÔØ ÐÏÄÐÉÓØ"
@@ -2176,7 +2182,7 @@ msgstr "%s ÏÛÉÂËÁ ÎÁ ÆÁÊÌÅ %s: %s\n"
msgid "%s failed: %s\n"
msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n"
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr "ÏÛÉÂËÁ × ÆÏÒÍÁÔÅ: %s\n"
@@ -2225,8 +2231,8 @@ msgstr "ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÓÐÉÓËÏ× ÎÉ ÈÏÚÑÅ× ÆÁÊÌÏ×, ÎÉ ÉÈ ID\n"
msgid "can't query %s: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÒÏÓÉÔØ %s: %s\n"
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
@@ -2240,7 +2246,7 @@ msgstr "ÏÛÉÂËÁ ÚÁÐÒÏÓÁ %s\n"
msgid "old format source packages cannot be queried\n"
msgstr "ÚÁÐÒÏÓÙ Ë ÉÓÈÏÄÎÙÍ ÐÁËÅÔÁÍ × ÓÔÁÒÏÍ ÆÏÒÍÁÔÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n"
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "ÎÉ ÏÄÉÎ ÐÁËÅÔ ÎÅ ÐÏÄÈÏÄÉÔ Ë %s: %s\n"
@@ -2309,7 +2315,7 @@ msgstr "ÎÏÍÅÒ ÚÁÐÉÓÉ ÐÁËÅÔÁ: %u\n"
msgid "record %u could not be read\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÚÁÐÉÓØ %u\n"
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n"
@@ -2483,83 +2489,83 @@ msgstr "ðÏÄÇÏÔÏ×ËÁ..."
msgid "Preparing packages for installation..."
msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× ÄÌÑ ÕÓÔÁÎÏ×ËÉ..."
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr "úÁÇÒÕÖÁÅÔÓÑ %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr " ... ËÁË %s\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s ÐÒÏÐÕÓËÁÅÔÓÑ - ÏÛÉÂËÁ ÐÅÒÅÄÁÞÉ - %s\n"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr "ÐÁËÅÔ %s - ÎÅ ÐÅÒÅÍÅÝÁÅÍÙÊ\n"
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ ÉÚ ÆÁÊÌÁ %s\n"
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "ÄÌÑ ÆÁÊÌÁ %s ÎÅÏÂÈÏÄÉÍÁ ÂÏÌÅÅ ÎÏ×ÁÑ ×ÅÒÓÉÑ RPM\n"
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n"
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "ÎÁÊÄÅÎÏ %d ÉÓÈÏÄÎÙÈ É %d ÂÉÎÁÒÎÙÈ ÐÁËÅÔÏ×\n"
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n"
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÂÉÎÁÒÎÙÅ ÐÁËÅÔÙ\n"
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %s: %s\n"
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ÚÁÄÁÅÔ ÎÅÓËÏÌØËÏ ÐÁËÅÔÏ×\n"
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ %s\n"
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "ÏÔËÁÔÉÔØ (+%d,-%d) ÐÁËÅÔÙ Ë %s"
@@ -2777,13 +2783,13 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ: %s.\n"
msgid "cannot open Packages database in %s\n"
msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n"
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, fuzzy, c-format
msgid "cannot open Solve database in %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ RPM × %s\n"
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -2989,11 +2995,11 @@ msgid "install/erase %d elements\n"
msgstr ""
#: lib/verify.c:288
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+msgid "missing %c %s"
msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ %s"
-#: lib/verify.c:389
+#: lib/verify.c:395
#, fuzzy, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: "
@@ -3172,165 +3178,180 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr "ÓÏÚÄÁÔØ ÚÁÇÏÌÏ×ËÉ, ÓÏ×ÍÅÓÔÉÍÙÅ Ó (ÕÓÔÁÒÅ×ÛÉÍÉ) ÐÁËÅÔÁÍÉ rpm[23]"
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: ÉÍÑ ËÌÀÞÁ \"%s\" ÎÅ ÉÚ×ÅÓÔÎÏ, ÉÇÎÏÒÉÒÕÅÔÓÑ\n"
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÄÅËÓ %s ÉÓÐÏÌØÚÕÑ db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, c-format
msgid "cannot open %s index\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÄÅËÓ %s\n"
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n"
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n"
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, fuzzy, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n"
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "h#%6u: already checked.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2136
+#, fuzzy, c-format
+msgid "h#%6u: %s"
+msgstr "%s: %s\n"
+
+#: rpmdb/rpmdb.c:2142
+#, fuzzy, c-format
+msgid "rpmdb: header #%u: %s -- skipping.\n"
msgstr "rpmdb: ÐÏÌÕÞÅÎ ÐÏ×ÒÅÖÄÅÎÎÙÊ ÚÁÇÏÌÏ×ÏË #%u, ÐÒÏÐÕÓËÁÅÔÓÑ.\n"
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2163
+#, fuzzy, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr "rpmdb: ÐÏÌÕÞÅÎ ÐÏ×ÒÅÖÄÅÎÎÙÊ ÚÁÇÏÌÏ×ÏË #%u, ÐÒÏÐÕÓËÁÅÔÓÑ.\n"
+
+#: rpmdb/rpmdb.c:2437
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ ÚÁÇÏÌÏ×ÏË × 0x%x\n"
-#: rpmdb/rpmdb.c:2365
+#: rpmdb/rpmdb.c:2500
#, fuzzy, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n"
-#: rpmdb/rpmdb.c:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "ÕÄÁÌÑÅÔÓÑ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s.\n"
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "ÕÄÁÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ ÉÚ ÉÎÄÅËÓÁ %s.\n"
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, fuzzy, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n"
-#: rpmdb/rpmdb.c:2533
+#: rpmdb/rpmdb.c:2668
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n"
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "ÏÛÉÂËÁ(%d) ÕÄÁÌÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s\n"
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "ÏÛÉÂËÁ(%d) ÒÅÚÅÒ×ÉÒÏ×ÁÎÉÑ ÐÁÍÑÔÉ ÄÌÑ ÏÂÒÁÚÁ ÎÏ×ÏÇÏ ÐÁËÅÔÁ\n"
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ \"%s\" × ÉÎÄÅËÓ %s.\n"
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ × ÉÎÄÅËÓ %s\n"
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n"
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "ÕÄÁÌÑÅÔÓÑ %s ÐÏÓÌÅ ÕÓÐÅÛÎÏÇÏ ÚÁ×ÅÒÛÅÎÉÑ ÐÅÒÅÉÎÄÅËÁÃÉÉ ÂÁÚÙ × db3.\n"
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ"
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "ÐÅÒÅÓÔÒÁÉ×ÁÅÔÓÑ ÂÁÚÁ ÄÁÎÎÙÈ %s × %s\n"
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr "×ÒÅÍÅÎÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ\n"
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, c-format
msgid "creating directory %s\n"
msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s\n"
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, c-format
msgid "creating directory %s: %s\n"
msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s: %s\n"
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n"
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÎÏ×ÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n"
-#: rpmdb/rpmdb.c:3424
-#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+#: rpmdb/rpmdb.c:3565
+#, fuzzy, c-format
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr "ÚÁÐÉÓØ ÎÏÍÅÒ %u × ÂÁÚÅ ÄÁÎÎÙÈ ÎÅ×ÅÒÎÁ, ÐÒÏÐÕÓËÁÅÔÓÑ.\n"
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÚÁÐÉÓØ (ÐÅÒ×ÏÎÁÞÁÌØÎÏ × %u)\n"
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"ÐÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n"
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÍÅÎÉÔØ ÓÔÁÒÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÎÁ ÎÏ×ÕÀ!\n"
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr "ÆÁÊÌÙ × %s ÚÁÍÅÎÑÀÔÓÑ ÆÁÊÌÁÍÉ ÉÚ %s ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ"
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, c-format
msgid "removing directory %s\n"
msgstr "ÕÄÁÌÑÅÔÓÑ ËÁÔÁÌÏÇ %s\n"
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n"
diff --git a/po/sk.po b/po/sk.po
index b7f2ece63..0008fa0d6 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -115,7 +115,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "pou¾i» <adresár> ako adresár najvy¹¹ej úrovne"
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -407,40 +407,40 @@ msgstr "--sign mô¾e by» pou¾íté iba poèas zostavenia balíka"
msgid "exec failed\n"
msgstr "vykonanie zlyhalo\n"
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr "neboli zadané ¾iadne balíky pre znovuzostavenie"
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr "neboli zadané ¾iadne spec-súbory pre zostavenie"
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr "neboli zadané ¾iadne tar-súbory pre zostavenie"
-#: rpmqv.c:1061
+#: rpmqv.c:1063
#, fuzzy
msgid "no packages given for erase"
msgstr "neboli zadané ¾iadne balíky pre in¹taláciu"
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr "neboli zadané ¾iadne balíky pre in¹taláciu"
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr "neboli zadané ¾iadne argumenty pre otázku"
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr "neboli zadané ¾iadne argumenty pre overenie"
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr "neoèakávané argumenty pre --querytags"
-#: rpmqv.c:1155
+#: rpmqv.c:1157
#, fuzzy
msgid "no arguments given"
msgstr "neboli zadané ¾iadne argumenty pre otázku"
@@ -1646,43 +1646,44 @@ msgstr "nie je mo¾né zapísa» do %s: "
msgid "error creating temporary file %s\n"
msgstr "chyba pri vytváraní doèasného súboru %s"
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/package.c:237
+#: lib/package.c:593
#, fuzzy
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "táto verzia RPM podporuje iba balíky s hlavným èíslom <= 3"
-#: lib/package.c:245
+#: lib/package.c:601
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "táto verzia RPM podporuje iba balíky s hlavným èíslom <= 3"
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature zlyhalo\n"
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Podpis nie je k dispozícii\n"
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead zlyhalo\n"
@@ -1784,7 +1785,7 @@ msgstr "skratka pre --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "balík %s nie je nain¹talovaný\n"
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
#, fuzzy
msgid "<packagefile>+"
msgstr " -p <súbor_balíku>+"
@@ -1850,42 +1851,47 @@ msgstr "nevykona» ¾iadne etapy"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "nevykona» ¾iadne etapy"
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "neoverova» závislosti balíka"
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "neoverova» architektúru balíka"
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
#, fuzzy
msgid "don't verify package signature(s)"
msgstr "overi» podpis balíka"
-#: lib/poptI.c:197
+#: lib/poptI.c:199
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "nevykona» ¾iadne skripty spú¹»ané týmto balíkom"
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "nevykona» ¾iadne skripty ¹pecifikované balíkom"
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "nevykona» ¾iadne in¹talaèné skripty"
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "nevykona» ¾iadne in¹talaèné skripty"
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "nevykona» ¾iadne in¹talaèné skripty"
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1893,49 +1899,49 @@ msgstr ""
"aktualizova» na star¹iu verziu balíka (--force to pri aktualizácii urobí "
"automaticky)"
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr "vypisova» percentá poèas in¹talácie balíka"
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr "presunú» balík do <adresára>, pokiaµ to balík povoµuje"
-#: lib/poptI.c:222
+#: lib/poptI.c:224
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "presunú» súbory zo <starej_cesty> do <novej_cesty>"
-#: lib/poptI.c:223
+#: lib/poptI.c:225
#, fuzzy
msgid "<old>=<new>"
msgstr " --relocate <stará_cesta>=<nová_cesta>"
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr "in¹talova» aj pokiaµ balík prepí¹e in¹talované súbory"
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr "prein¹talova», pokiaµ u¾ balík existuje"
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr "nein¹talova», ale oznámi», èi by to bolo mo¾né"
-#: lib/poptI.c:240
+#: lib/poptI.c:242
#, fuzzy
msgid "upgrade package(s)"
msgstr " --upgrade <súbor_balíka>"
@@ -2076,85 +2082,85 @@ msgstr "zobrazii» stav daných súborov"
msgid "display a verbose file listing"
msgstr "zobrazi» podrobný zoznam súborov balíka"
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
#, fuzzy
msgid "don't verify MD5 digest of files"
msgstr "zobrazi» súbory v balíku"
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
#, fuzzy
msgid "don't verify size of files"
msgstr "zobrazi» súbory v balíku"
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
#, fuzzy
msgid "don't verify symlink path of files"
msgstr "zobrazi» súbory v balíku"
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
#, fuzzy
msgid "don't verify owner of files"
msgstr "zobrazi» súbory v balíku"
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
#, fuzzy
msgid "don't verify group of files"
msgstr "zobrazi» súbory v balíku"
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
#, fuzzy
msgid "don't verify mode of files"
msgstr "zobrazi» súbory v balíku"
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
#, fuzzy
msgid "don't verify files in package"
msgstr "zobrazi» súbory v balíku"
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
#, fuzzy
msgid "don't verify package dependencies"
msgstr "neoverova» závislosti balíka"
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "nevykona» ¾iadne etapy"
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "zobrazi» súbory v balíku"
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "zobrazi» súbory v balíku"
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
#, fuzzy
msgid "sign package(s) (identical to --resign)"
msgstr "podpísa» balík (znièi» aktuálny podpis)"
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
#, fuzzy
msgid "verify package signature(s)"
msgstr "overi» podpis balíka"
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
#, fuzzy
msgid "sign package(s) (identical to --addsign)"
msgstr "podpísa» balík (znièi» aktuálny podpis)"
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
#, fuzzy
msgid "generate signature"
msgstr "vytvori» PGP/GPG podpis"
@@ -2230,7 +2236,7 @@ msgstr "nepodarilo sa otvori» %s: %s"
msgid "%s failed: %s\n"
msgstr "%s zlyhalo"
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "chyba formátu: %s\n"
@@ -2280,8 +2286,8 @@ msgstr "balík neobsahuje ani vlastníka súboru, ani zoznamy identifikácií"
msgid "can't query %s: %s\n"
msgstr "zmazanie %s zlyhalo: %s\n"
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "otvorenie %s zlyhalo\n"
@@ -2295,7 +2301,7 @@ msgstr "otázka na %s zlyhala\n"
msgid "old format source packages cannot be queried\n"
msgstr "nie je mo¾né pýta» sa zdrojových balíkov v starom formáte\n"
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "¾iadny z balíkov nespú¹»a %s\n"
@@ -2365,7 +2371,7 @@ msgstr "po¾aduje sa záznam èíslo %d\n"
msgid "record %u could not be read\n"
msgstr "záznam %d nie je mo¾né preèíta»\n"
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr "balík %s nie je nain¹talovaný\n"
@@ -2539,83 +2545,83 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "neboli zadané ¾iadne balíky pre in¹taláciu"
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr "Prená¹a sa %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr "... ako %s\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s vynechané - prenos zlyhal - %s\n"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "balík %s nie je nain¹talovaný\n"
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "chyba pri vytváraní doèasného súboru %s"
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nie je mo¾né nain¹talova»\n"
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "nájdených %d zdrojových a %d binárnych balíkov\n"
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "nevyrie¹ené závislosti:\n"
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr "in¹talujú sa binárne balíky\n"
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "nie je mo¾né otvori» súbor %s: %s"
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" ¹pecifikuje viac balíkov\n"
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "nie je mo¾né otvori» %s\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr "In¹taluje sa %s\n"
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2832,13 +2838,13 @@ msgstr "Nie je mo¾né otvori» %s pre èítanie: %s."
msgid "cannot open Packages database in %s\n"
msgstr "nie je mo¾né otvori» %s/packages.rpm\n"
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, fuzzy, c-format
msgid "cannot open Solve database in %s\n"
msgstr "nie je mo¾né otvori» %s/packages.rpm\n"
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -3051,10 +3057,10 @@ msgstr ""
#: lib/verify.c:288
#, fuzzy, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr "chýbajúce %s\n"
-#: lib/verify.c:389
+#: lib/verify.c:395
#, fuzzy, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: "
@@ -3233,166 +3239,181 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, fuzzy, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "nie je mo¾né otvori» %s na %s:%d"
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, fuzzy, c-format
msgid "cannot open %s index\n"
msgstr "nie je mo¾né otvori» %s\n"
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
#, fuzzy
msgid "no dbpath has been set\n"
msgstr "nebola nastavená ¾iadna dbpath"
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, 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:1449
+#: rpmdb/rpmdb.c:1527
#, 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:2033
+#: rpmdb/rpmdb.c:2127
+#, c-format
+msgid "h#%6u: already checked.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2136
+#, fuzzy, c-format
+msgid "h#%6u: %s"
+msgstr "súbor %s: %s\n"
+
+#: rpmdb/rpmdb.c:2142
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "rpmdb: header #%u: %s -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, 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:2365
+#: rpmdb/rpmdb.c:2500
#, 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:2480
+#: rpmdb/rpmdb.c:2615
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "odstraòuje sa index skupín\n"
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "odstraòuje sa index názvov\n"
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, 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:2533
+#: rpmdb/rpmdb.c:2668
#, 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:2543
+#: rpmdb/rpmdb.c:2678
#, 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:2690
+#: rpmdb/rpmdb.c:2827
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "chyba pri hµadaní balíka %s\n"
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "premenováva sa %s na %s\n"
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "premenováva sa %s na %s\n"
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, 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:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr "nebola nastavená ¾iadna dbpath"
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, 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:3370
+#: rpmdb/rpmdb.c:3508
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "doèasná databáza %s u¾ existuje"
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "vytvára sa adresár %s\n"
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "vytvára sa adresár %s\n"
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "otvára sa stará databáza\n"
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "otvára sa nová databáza\n"
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, fuzzy, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+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:3464
+#: rpmdb/rpmdb.c:3605
#, 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:3482
+#: rpmdb/rpmdb.c:3623
#, 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:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr "nepodarilo sa nahradi» starú databázu novou!\n"
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, 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:3502
+#: rpmdb/rpmdb.c:3643
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "vytvára sa adresár %s\n"
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "nepodarilo sa odstráni» adresár %s: %s\n"
diff --git a/po/sl.po b/po/sl.po
index 27aedf404..2eb3bf3b0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,12 +1,12 @@
# -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
# Copyright (C) 2000 Free Software Foundation, Inc.
# Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.284 2002/07/21 22:06:39 jbj Exp $
+# $Id: sl.po,v 1.285 2002/07/24 16:21:57 jbj Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -120,7 +120,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "uporabi <imenik> za korenski imenik"
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -406,40 +406,40 @@ msgstr "--sign sme biti podan le ob izgradnji paketa"
msgid "exec failed\n"
msgstr "izvajanje je bilo neuspe¹no\n"
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr "paketi za vnovièno izgradnjo niso navedeni"
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr "datoteka spec za izgradnjo manjka"
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr "arhiv tar za izgradnjo manjka"
-#: rpmqv.c:1061
+#: rpmqv.c:1063
#, fuzzy
msgid "no packages given for erase"
msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr "argumenti za poizvedbo niso podani"
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr "argumenti za preverjanje niso podani"
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr "neprièakovani argumenti za --querytags "
-#: rpmqv.c:1155
+#: rpmqv.c:1157
#, fuzzy
msgid "no arguments given"
msgstr "argumenti za poizvedbo niso podani"
@@ -1649,43 +1649,44 @@ msgstr "pisanje na %s ni mo¾no"
msgid "error creating temporary file %s\n"
msgstr "napaka pri ustvarjanju zaèasne datoteke %s"
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead je bil neuspe¹en\n"
-#: lib/package.c:237
+#: lib/package.c:593
#, fuzzy
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <= 3"
-#: lib/package.c:245
+#: lib/package.c:601
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <=4"
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature je bil neuspe¹en\n"
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Podpis ni na voljo\n"
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead je bil neuspe¹en\n"
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
@@ -1785,7 +1786,7 @@ msgstr "okraj¹ava za --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "paket %s-%s-%s je ¾e name¹èen"
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
#, fuzzy
msgid "<packagefile>+"
msgstr " -p <paket>+ "
@@ -1852,42 +1853,47 @@ msgstr "brez izvajanja katerekoli stopen izgradnje"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "brez izvajanja katerekoli stopen izgradnje"
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "brez preverjanja soodvisnosti paketa"
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "brez preverjanja arhitekture paketa"
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
#, fuzzy
msgid "don't verify package signature(s)"
msgstr "preveri podpis paketa(-ov)"
-#: lib/poptI.c:197
+#: lib/poptI.c:199
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "brez izvajanja katerihkoli skriptov, ki jih po¾ene ta paket"
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "brez izvajanja skriptov paketa"
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "brez izvajanja namestitvenih skriptov"
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "brez izvajanja namestitvenih skriptov"
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "brez izvajanja namestitvenih skriptov"
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1895,49 +1901,49 @@ msgstr ""
"nadgraditev na starej¹o razlièico paketa (--force pri nadgradnjah "
"avtomatièno vkljuèi to izbiro)"
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr "izpis odstotkov med namestitvijo"
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr "èe je mogoèe, bo paket prestavljen v imenik <imenik>"
-#: lib/poptI.c:222
+#: lib/poptI.c:224
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "prestavljanje datoteke iz stare poti v novo"
-#: lib/poptI.c:223
+#: lib/poptI.c:225
#, fuzzy
msgid "<old>=<new>"
msgstr " --relocate <starapot>=<novapot>"
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr "namesti, èetudi paket pi¹e prek ¾e name¹èene datoteke"
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr "ponovno namesti, èe paket ¾e obstaja"
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr "ne namesti, a ugotovi, èe bi delovalo"
-#: lib/poptI.c:240
+#: lib/poptI.c:242
#, fuzzy
msgid "upgrade package(s)"
msgstr " --upgrade <paket> "
@@ -2077,84 +2083,84 @@ msgstr "izpis stanja seznama datotek"
msgid "display a verbose file listing"
msgstr "izpis ob¹irnega seznama datotek"
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
#, fuzzy
msgid "don't verify MD5 digest of files"
msgstr "brez preverjanja datotek v paketu"
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
#, fuzzy
msgid "don't verify size of files"
msgstr "brez preverjanja datotek v paketu"
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
#, fuzzy
msgid "don't verify symlink path of files"
msgstr "brez preverjanja datotek v paketu"
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
#, fuzzy
msgid "don't verify owner of files"
msgstr "brez preverjanja datotek v paketu"
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
#, fuzzy
msgid "don't verify group of files"
msgstr "brez preverjanja datotek v paketu"
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
#, fuzzy
msgid "don't verify mode of files"
msgstr "brez preverjanja datotek v paketu"
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr "brez preverjanja datotek v paketu"
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
#, fuzzy
msgid "don't verify package dependencies"
msgstr "brez preverjanja soodvisnosti paketa"
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "brez izvajanja katerekoli stopen izgradnje"
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "brez preverjanja datotek v paketu"
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "brez preverjanja datotek v paketu"
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
#, fuzzy
msgid "sign package(s) (identical to --resign)"
msgstr "podpi¹i paket(e) (trenutni podpis zavrzi)"
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
#, fuzzy
msgid "verify package signature(s)"
msgstr "preveri podpis paketa(-ov)"
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
#, fuzzy
msgid "sign package(s) (identical to --addsign)"
msgstr "podpi¹i paket(e) (trenutni podpis zavrzi)"
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
#, fuzzy
msgid "generate signature"
msgstr "izdelava podpisa PGP/GPG"
@@ -2230,7 +2236,7 @@ msgstr "neuspe¹no odpiranje %s: %s\n"
msgid "%s failed: %s\n"
msgstr "%s neuspe¹en"
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "napaka v obliki: %s\n"
@@ -2280,8 +2286,8 @@ msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id"
msgid "can't query %s: %s\n"
msgstr "ni mo¾no poizvedeti o %s: %s\n"
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr "odpiranje %s je bilo neuspe¹no: %s\n"
@@ -2295,7 +2301,7 @@ msgstr "poizvedba po %s je bila neuspe¹na\n"
msgid "old format source packages cannot be queried\n"
msgstr "poizvedba po izvornih paketih v stari obliki ni mo¾na\n"
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "noben paket ne pro¾i %s\n"
@@ -2365,7 +2371,7 @@ msgstr "¹tevilka zapisa paketa: %d\n"
msgid "record %u could not be read\n"
msgstr "zapisa %d ni mo¾no prebrati\n"
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s ni name¹èen\n"
@@ -2541,83 +2547,83 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "paketi za namestitev niso navedeni"
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr "Prena¹anje %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr " ... kot %s\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "preskoèeno - %s - prenos neuspe¹en - %s\n"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr "paketa %s ni mo¾no premakniti\n"
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr "napaka pri branju iz datoteke %s\n"
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "datoteka %s zahteva novej¹o razlièico RPM\n"
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s ni mo¾no namestiti\n"
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "najdeno %d izvornih in %d binarnih paketov\n"
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "neuspe¹ne soodvisnosti:\n"
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr "name¹èanje binarnih paketov\n"
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "ni mo¾no odpreti datoteke %s: %s\n"
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" doloèa veè paketov\n"
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ni mo¾no odpreti %s: %s\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr "Name¹èanje %s\n"
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2835,13 +2841,13 @@ msgstr "%s ni mo¾no odpreti za branje: %s."
msgid "cannot open Packages database in %s\n"
msgstr "zbirko podatkov paketov ni mo¾no odpreti v %s\n"
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, fuzzy, c-format
msgid "cannot open Solve database in %s\n"
msgstr "datoteke %s/packages.rpm ni mogo¾no odpreti\n"
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr "zbiranje seznama priklopljenih datoteènih sistemov.\n"
@@ -3054,10 +3060,10 @@ msgstr ""
#: lib/verify.c:288
#, fuzzy, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr "manjka %s\n"
-#: lib/verify.c:389
+#: lib/verify.c:395
#, fuzzy, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: "
@@ -3238,168 +3244,183 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: neprepoznano ime znaèke: \"%s\" prezrto\n"
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, fuzzy, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "ni mo¾no odpreti kazala %s z uporabo db%d - %s (%d)"
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, fuzzy, c-format
msgid "cannot open %s index\n"
msgstr "ni mo¾no odpreti kazala %s:"
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
#, fuzzy
msgid "no dbpath has been set\n"
msgstr "dbpath ni nastavljena"
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, 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:1449
+#: rpmdb/rpmdb.c:1527
#, fuzzy, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "napaka(%d) pri pisanju zapisa %s v %s"
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
+#, c-format
+msgid "h#%6u: already checked.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2136
+#, fuzzy, c-format
+msgid "h#%6u: %s"
+msgstr "datoteka %s: %s\n"
+
+#: rpmdb/rpmdb.c:2142
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "rpmdb: header #%u: %s -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, 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:2365
+#: rpmdb/rpmdb.c:2500
#, 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:2480
+#: rpmdb/rpmdb.c:2615
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "odstranjevanje \"%s\" iz kazala %s.\n"
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "odstranjevanje %d vnosov iz kazala %s\n"
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, 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:2533
+#: rpmdb/rpmdb.c:2668
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "napaka(%d) pri pisanju zapisa %s v %s"
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "napaka(%d) pri brisanju zapisa %s iz %s"
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "napaka(%d) pri iskanju paketa %s\n"
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, fuzzy, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "dodajanje \"%s\" v kazalo %s.\n"
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "dodajanje %d vnosov v kazalo %s.\n"
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "napaka(%d) pri pisanju zapisa %s v %s"
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr "dbpath ni nastavljena"
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n"
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "zaèasna podatkovna zbirka %s ¾e obstaja"
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "ustvarjanje imenika: %s\n"
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "ustvarjanje imenika: %s\n"
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "odpiranje stare podatkovne zbirke\n"
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "odpiramo nove podatkovne zbirke z dbapi %d\n"
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, fuzzy, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr "zapis ¹t. %d v zbirki je po¹kodovan -- preskoèeno."
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "zapisa ni mo¾no dodati na %d"
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
#, 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:3490
+#: rpmdb/rpmdb.c:3631
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:3492
+#: rpmdb/rpmdb.c:3633
#, 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:3502
+#: rpmdb/rpmdb.c:3643
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "odstranjevanje imenika: %s\n"
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "neuspe¹na odstranitev imenika %s: %s\n"
diff --git a/po/sr.po b/po/sr.po
index 0d5fc3963..09c7621d9 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-0400\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-05-02 21:41:47-0400\n"
@@ -112,7 +112,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr "koristi <dir> kao direktorijum najvi¹eg nivoa"
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -402,40 +402,40 @@ msgstr "--sign se mo¾e koristiti samo kod kreiranja paketa"
msgid "exec failed\n"
msgstr "%s: Neuspelo otvaranje\n"
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr "nedosataje paket za rekreiranje"
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr "nedostaje specifikacije za kreiranje"
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr "nedostaju 'tar' datoteke za kreiranje"
-#: rpmqv.c:1061
+#: rpmqv.c:1063
#, fuzzy
msgid "no packages given for erase"
msgstr "nedostaje paket za instalaciju"
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr "nedostaje paket za instalaciju"
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr "nedostaju argumenti za upit"
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr "nedostaju argumenti za proveru"
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr "neoèekivani argumenti za --querytags"
-#: rpmqv.c:1155
+#: rpmqv.c:1157
#, fuzzy
msgid "no arguments given"
msgstr "nedostaju argumenti za upit"
@@ -1634,43 +1634,44 @@ msgstr "Ne mogu da otvorim datoteku %s: "
msgid "error creating temporary file %s\n"
msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/package.c:237
+#: lib/package.c:593
#, fuzzy
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a"
-#: lib/package.c:245
+#: lib/package.c:601
#, fuzzy
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a"
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: Neuspelo 'rpmReadSignature'\n"
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Potpis nije na raspolaganju\n"
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Neuspeo 'readLead'\n"
@@ -1771,7 +1772,7 @@ msgstr "skraæenica za --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "paket %s nije instaliran\n"
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
#, fuzzy
msgid "<packagefile>+"
msgstr " -b<faza> <spec>\t "
@@ -1838,91 +1839,96 @@ msgstr "nemoj izvr¹iti nijednu fazu"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "nemoj izvr¹iti nijednu fazu"
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "nemoj proveravati zavisnosti paketa"
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "nemoj proveravati arhitekturu paketa"
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
#, fuzzy
msgid "don't verify package signature(s)"
msgstr "proveri potpis u paketu"
-#: lib/poptI.c:197
+#: lib/poptI.c:199
#, fuzzy
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "upit nad paketom koji ima <datoteku>"
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, fuzzy, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "nemoj izvr¹iti nijedan skript iz paketa"
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, fuzzy, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "nemoj izvr¹iti nijedan instalacioni skript"
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, fuzzy, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "nemoj izvr¹iti nijedan instalacioni skript"
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, fuzzy, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "nemoj izvr¹iti nijedan instalacioni skript"
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
"a¾uriraj na staru verziju paketa (--force kod a¾uriranja ovo radi automatski)"
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr "pi¹i procente instalacije paketa"
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr "premesti paket u <dir>, ako se mo¾e premestiti"
-#: lib/poptI.c:222
+#: lib/poptI.c:224
#, fuzzy
msgid "relocate files from path <old> to <new>"
msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
-#: lib/poptI.c:223
+#: lib/poptI.c:225
#, fuzzy
msgid "<old>=<new>"
msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr "instaliraj èak iako æe paket zameniti instalirane datoteke"
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr "ponovo instaliraj ako je paket veæ prisutan"
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr "nemoj instalirati, ali reci da li æe da radi ili ne"
-#: lib/poptI.c:240
+#: lib/poptI.c:242
#, fuzzy
msgid "upgrade package(s)"
msgstr "instaliraj paket"
@@ -2069,85 +2075,85 @@ msgstr ""
msgid "display a verbose file listing"
msgstr "prika¾i listu datoteka u paketu"
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
#, fuzzy
msgid "don't verify MD5 digest of files"
msgstr "instaliraj paket"
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
#, fuzzy
msgid "don't verify size of files"
msgstr "instaliraj paket"
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
#, fuzzy
msgid "don't verify symlink path of files"
msgstr "instaliraj paket"
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
#, fuzzy
msgid "don't verify owner of files"
msgstr "instaliraj paket"
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
#, fuzzy
msgid "don't verify group of files"
msgstr "instaliraj paket"
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
#, fuzzy
msgid "don't verify mode of files"
msgstr "instaliraj paket"
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
#, fuzzy
msgid "don't verify files in package"
msgstr "instaliraj paket"
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
#, fuzzy
msgid "don't verify package dependencies"
msgstr "nemoj proveravati zavisnosti paketa"
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "nemoj izvr¹iti nijednu fazu"
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "instaliraj paket"
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "instaliraj paket"
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
#, fuzzy
msgid "sign package(s) (identical to --resign)"
msgstr "potpi¹i paket (ukloni tekuæi potpis)"
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
#, fuzzy
msgid "verify package signature(s)"
msgstr "proveri potpis u paketu"
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
#, fuzzy
msgid "sign package(s) (identical to --addsign)"
msgstr "potpi¹i paket (ukloni tekuæi potpis)"
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
#, fuzzy
msgid "generate signature"
msgstr "napravi PGP potpis"
@@ -2222,7 +2228,7 @@ msgstr "neuspelo otvaranje %s: %s"
msgid "%s failed: %s\n"
msgstr "PGP omanuo"
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, fuzzy, c-format
msgid "incorrect format: %s\n"
msgstr "gre¹ka u formatu: %s\n"
@@ -2273,8 +2279,8 @@ msgstr "paket nema imena"
msgid "can't query %s: %s\n"
msgstr "gre¹ka: ne mogu da otvorim %s\n"
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, fuzzy, c-format
msgid "open of %s failed: %s\n"
msgstr "neuspelo otvaranje %s: %s\n"
@@ -2288,7 +2294,7 @@ msgstr "upit nad %s neuspeo\n"
msgid "old format source packages cannot be queried\n"
msgstr "Upit se ne mo¾e izvesti nad izvorni paketima u starom formatu\n"
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "nijedan paket ne aktivira %s\n"
@@ -2358,7 +2364,7 @@ msgstr "pogre¹an broj paketa: %s\n"
msgid "record %u could not be read\n"
msgstr "ne mogu da proèitam slog %d\n"
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s nije instaliran\n"
@@ -2532,84 +2538,84 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr "nedostaje paket za instalaciju"
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr "Pribavljam %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, fuzzy, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "gre¹ka: preskaèem %s - neuspelo preno¹enje - %s\n"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, fuzzy, c-format
msgid "package %s is not relocateable\n"
msgstr "paket %s nije instaliran\n"
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, fuzzy, c-format
msgid "error reading from file %s\n"
msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, fuzzy, c-format
msgid "%s cannot be installed\n"
msgstr "gre¹ka: %s se ne mo¾e instalirati\n"
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, fuzzy, c-format
msgid "found %d source and %d binary packages\n"
msgstr "grupa %s ne sadr¾i nijedan paket\n"
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "lo¹e meðuzavisnosti:\n"
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
#, fuzzy
msgid "installing binary packages\n"
msgstr "instaliraj paket"
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, fuzzy, c-format
msgid "cannot open file %s: %s\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" odreðuje vi¹e paketa\n"
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, fuzzy, c-format
msgid "cannot open %s: %s\n"
msgstr "gre¹ka: ne mogu da otvorim %s\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr "Instaliram %s\n"
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, fuzzy, c-format
msgid "rollback %d packages to %s"
msgstr "neodstaje paket za deinstalaciju"
@@ -2826,13 +2832,13 @@ msgstr "Ne mogu da otvorim %s za èitanje: %s"
msgid "cannot open Packages database in %s\n"
msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n"
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, fuzzy, c-format
msgid "cannot open Solve database in %s\n"
msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n"
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -3045,10 +3051,10 @@ msgstr ""
#: lib/verify.c:288
#, fuzzy, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr "nedostaje { posle %"
-#: lib/verify.c:389
+#: lib/verify.c:395
#, fuzzy, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr "Nezadovoljene meðuzavisnosti za %s-%s-%s: "
@@ -3228,165 +3234,180 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, fuzzy, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "Ne mogu da otvorim datoteku %s: "
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, fuzzy, c-format
msgid "cannot open %s index\n"
msgstr "gre¹ka: ne mogu da otvorim %s\n"
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
#, fuzzy
msgid "no dbpath has been set\n"
msgstr "dbpath nije odreðen"
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, 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:1449
+#: rpmdb/rpmdb.c:1527
#, fuzzy, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "gre¹ka zapisivanja sloga %s u %s"
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
+#, c-format
+msgid "h#%6u: already checked.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2136
+#, fuzzy, c-format
+msgid "h#%6u: %s"
+msgstr "neuspelo otvaranje %s: %s"
+
+#: rpmdb/rpmdb.c:2142
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "rpmdb: header #%u: %s -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, 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:2365
+#: rpmdb/rpmdb.c:2500
#, 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:2480
+#: rpmdb/rpmdb.c:2615
#, fuzzy, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "gre¹ka uklanjanja sloga %s u %s"
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, fuzzy, c-format
msgid "removing %d entries from %s index.\n"
msgstr "gre¹ka uklanjanja sloga %s u %s"
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, 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:2533
+#: rpmdb/rpmdb.c:2668
#, fuzzy, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr "gre¹ka zapisivanja sloga %s u %s"
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, fuzzy, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr "gre¹ka uklanjanja sloga %s u %s"
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, fuzzy, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "gre¹ka kod potrage za paketom %s\n"
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, fuzzy, c-format
msgid "adding %d entries to %s index.\n"
msgstr "gre¹ka uklanjanja sloga %s u %s"
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, fuzzy, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr "gre¹ka zapisivanja sloga %s u %s"
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr "dbpath nije odreðen"
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, fuzzy, c-format
msgid "rebuilding database %s into %s\n"
msgstr "rekreiraj bazu podataka iz postojeæe baze"
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, fuzzy, c-format
msgid "temporary database %s already exists\n"
msgstr "privremena baza podataka %s veæ postoji"
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, fuzzy, c-format
msgid "creating directory %s\n"
msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, fuzzy, c-format
msgid "creating directory %s: %s\n"
msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, fuzzy, c-format
msgid "opening old database with dbapi %d\n"
msgstr "rekreiraj bazu podataka iz postojeæe baze"
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, fuzzy, c-format
msgid "opening new database with dbapi %d\n"
msgstr "rekreiraj bazu podataka iz postojeæe baze"
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, fuzzy, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+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:3464
+#: rpmdb/rpmdb.c:3605
#, fuzzy, c-format
msgid "cannot add record originally at %u\n"
msgstr "ne mogu da dodam slog originalno na %d"
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, fuzzy, c-format
msgid "removing directory %s\n"
msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, fuzzy, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "neuspelo otvaranje %s: %s"
diff --git a/po/sv.po b/po/sv.po
index 4fed97098..ba4da8f69 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -113,7 +113,7 @@ msgstr "<kommando>"
msgid "use <dir> as the top level directory"
msgstr "använd <kat> som toppkatalog"
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr "<kat>"
@@ -397,39 +397,39 @@ msgstr "--sign kan enbart användas vid pakettillverkning"
msgid "exec failed\n"
msgstr "exec misslyckades\n"
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr "inga paketfiler angivna för omtillverkning"
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr "inga specfiler angivna för tillverkning"
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr "inga tar-filer angivna för tillverkning"
-#: rpmqv.c:1061
+#: rpmqv.c:1063
msgid "no packages given for erase"
msgstr "inga paket angivna att radera"
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr "inga paket angivna för installation"
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr "inga parametrar angivna för fråga"
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr "inga parametrar angivna för verifiering"
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr "oväntade argument till --querytags "
-#: rpmqv.c:1155
+#: rpmqv.c:1157
msgid "no arguments given"
msgstr "inga argument angivna"
@@ -1602,41 +1602,42 @@ msgstr "kan inte skriva till %%%s %s\n"
msgid "error creating temporary file %s\n"
msgstr "fel när tämporärfil %s skapades\n"
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr "endast V3-signaturer kan verifieras, hoppar över V%u-signatur"
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead misslyckades\n"
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "paket med versionsnummer 1 stöds inte av denna version av RPM\n"
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "endast paket med huvudnummer <= 4 stöds av denna version av RPM\n"
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature misslyckades\n"
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen signatur tillgänglig\n"
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: headerRead misslyckades\n"
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr "endast V3-signaturer kan verifieras, hoppar över V%u-signatur"
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread misslyckades: %s\n"
@@ -1732,7 +1733,7 @@ msgstr "kortform för --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "uppgradera paket om redan installerat/de"
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
msgid "<packagefile>+"
msgstr "<paketfil>+"
@@ -1797,39 +1798,44 @@ msgstr "utför inte (eventuellt) %%preun-skript"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "utför inte (eventuellt) %%postun-skript"
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
msgid "don't verify package digest(s)"
msgstr "verifiera inte paketkontrollsummor"
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "verifiera inte paketarkitektur"
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
msgid "don't verify package signature(s)"
msgstr "verifiera inte paketsignatur(er)"
-#: lib/poptI.c:197
+#: lib/poptI.c:199
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "kör inte skript utlösta av detta paket"
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "kör inte %%triggerprein-skript"
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "kör inte %%triggerin-skript"
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "kör inte %%triggerun-skript"
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "kör inte %%triggerpostun-skript"
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1837,47 +1843,47 @@ msgstr ""
"uppgradera till en gammal version av paketet (--force vid uppgraderingar gör "
"detta automatiskt)"
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr "skriv procent allt eftersom paketet installeras"
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr "flytta paketet till <katalog>, om flyttbart"
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr "relokera filer från <gammal> till <ny>"
-#: lib/poptI.c:223
+#: lib/poptI.c:225
msgid "<old>=<new>"
msgstr "<gammal>=<ny>"
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr "spara raderade paketfiler genom ompaketering"
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr "installera även om paketet byter ut installerade filer"
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr "installera om ifall paketet redan är installerat"
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr "avinstallera nya, ominstallera gamla, paket tillbaka till <datum>"
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr "<datum>"
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr "installera inte, men tala om ifall det skulle fungera eller inte"
-#: lib/poptI.c:240
+#: lib/poptI.c:242
msgid "upgrade package(s)"
msgstr "uppgradera paket"
@@ -2000,71 +2006,71 @@ msgstr "visa tillstånd för de listade filerna"
msgid "display a verbose file listing"
msgstr "visa en utförlig fillistning"
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
msgid "don't verify MD5 digest of files"
msgstr "verifiera inte MD5-summor för filer"
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
msgid "don't verify size of files"
msgstr "verifiera inte storlekar på filer"
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
msgid "don't verify symlink path of files"
msgstr "verifiera inte sökvägen i symboliska länkar"
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
msgid "don't verify owner of files"
msgstr "verifiera inte ägare till filer"
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
msgid "don't verify group of files"
msgstr "verifiera inte grupper till filer"
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr "verifiera inte modifikationstiden för filer"
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
msgid "don't verify mode of files"
msgstr "verifiera inte rättigheter för filer"
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr "verifiera inte filerna i paketet"
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr "verifiera inte paketberoenden"
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
msgid "don't execute verify script(s)"
msgstr "utför inte verify-skript"
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "verifiera inte GPG V3 DSA-signatur(er)"
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "verifiera inte PGP V3 RSA/MD5-signatur(er)"
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
msgid "sign package(s) (identical to --resign)"
msgstr "signera paket (detsamma som --resign)"
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
msgid "verify package signature(s)"
msgstr "verifiera paketsignatur(er)"
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr "importera en publik nyckel med skal"
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
msgid "sign package(s) (identical to --addsign)"
msgstr "signera paket (detsamma som --addsign)"
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
msgid "generate signature"
msgstr "generera signatur"
@@ -2138,7 +2144,7 @@ msgstr "%s misslyckades på fil %s: %s\n"
msgid "%s failed: %s\n"
msgstr "%s misslyckades: %s\n"
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr "fel format: %s\n"
@@ -2186,8 +2192,8 @@ msgstr "paketet har varken filägare eller id-listor\n"
msgid "can't query %s: %s\n"
msgstr "kan inte fråga %s: %s\n"
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr "misslyckades med att öppna %s: %s\n"
@@ -2201,7 +2207,7 @@ msgstr "fråga av %s misslyckades\n"
msgid "old format source packages cannot be queried\n"
msgstr "källpaket i gammalt format går inte att fråga om\n"
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "%s: inte en paketlastspecifikation: %s\n"
@@ -2270,7 +2276,7 @@ msgstr "paketpost nummer: %u\n"
msgid "record %u could not be read\n"
msgstr "post %u kunde inte läsas\n"
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s är inte installerat\n"
@@ -2442,82 +2448,82 @@ msgstr "Förbereder..."
msgid "Preparing packages for installation..."
msgstr "Förbereder paket för installation ..."
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr "Hämtar %s\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr " ... som %s\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "hoppar över %s - överföring misslyckades - %s\n"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr "paket %s är inte relokerbart\n"
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr "fel vid läsning från fil %s\n"
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "filen %s behöver en nyare version av RPM\n"
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s kan inte installeras\n"
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "hittade %d käll- och %d binärpaket\n"
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr "Ouppfyllda beroenden:\n"
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr " Föreslagna lösningar:\n"
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr "installerar binärpaket\n"
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "kan inte öppna filen %s: %s\n"
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" anger flera paket\n"
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan inte öppna %s: %s\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr "Installerar %s\n"
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr "återställer %d paket till %s"
@@ -2733,13 +2739,13 @@ msgstr "Kan inte öppna %s för läsning: %s.\n"
msgid "cannot open Packages database in %s\n"
msgstr "kan inte öppna paketdatabas i %s\n"
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, fuzzy, c-format
msgid "cannot open Solve database in %s\n"
msgstr "kan inte öppna paketdatabas i %s\n"
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr "hämtar lista över monterade filsystem\n"
@@ -2942,11 +2948,11 @@ msgid "install/erase %d elements\n"
msgstr ""
#: lib/verify.c:288
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+msgid "missing %c %s"
msgstr "saknas %s"
-#: lib/verify.c:389
+#: lib/verify.c:395
#, fuzzy, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr "Ouppfyllda beroenden för %s: "
@@ -3122,164 +3128,179 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr "generera huvuden kompatibla med (äldre) rpm[23]-paketering"
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: okänt taggnamn: \"%s\" ignorerat\n"
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "kan inte öppna %s-indexet med db%d - %s (%d)\n"
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, c-format
msgid "cannot open %s index\n"
msgstr "kan inte öppna %s-indexet\n"
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr "ingen dbpath har satts\n"
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, 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:1449
+#: rpmdb/rpmdb.c:1527
#, 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:2033
+#: rpmdb/rpmdb.c:2127
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "h#%6u: already checked.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2136
+#, fuzzy, c-format
+msgid "h#%6u: %s"
+msgstr "%s: %s\n"
+
+#: rpmdb/rpmdb.c:2142
+#, fuzzy, c-format
+msgid "rpmdb: header #%u: %s -- skipping.\n"
msgstr "rpmdb: skadad huvudinstans #%u hämtad, hoppar över.\n"
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2163
+#, fuzzy, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr "rpmdb: skadad huvudinstans #%u hämtad, hoppar över.\n"
+
+#: rpmdb/rpmdb.c:2437
#, 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:2365
+#: rpmdb/rpmdb.c:2500
#, 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:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "tar bort \"%s\" från %s-indexet.\n"
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "tar bort %d poster från %s-indexet.\n"
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, 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:2533
+#: rpmdb/rpmdb.c:2668
#, 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:2543
+#: rpmdb/rpmdb.c:2678
#, 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:2690
+#: rpmdb/rpmdb.c:2827
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "fel(%d) vid allokering av ny paketinstans\n"
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "lägger till \"%s\" till %s-indexet.\n"
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "lägger till %d poster till %s-indexet.\n"
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, 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:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr "tar bort %s efter lyckad db3-ombyggnad.\n"
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr "ingen dbpath har satts"
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "bygger om databas %s till %s\n"
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr "tillfällig databas %s existerar redan\n"
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, c-format
msgid "creating directory %s\n"
msgstr "skapar katalog %s\n"
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, c-format
msgid "creating directory %s: %s\n"
msgstr "skapar katalog %s: %s\n"
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "öppnar gammal databas med dbapi %d\n"
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "öppnar ny databas med dbapi %d\n"
-#: rpmdb/rpmdb.c:3424
-#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+#: rpmdb/rpmdb.c:3565
+#, 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:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "kan inte lägga till post ursprungligen vid %u\n"
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n"
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr "kunde inte ersätta gammal databas med ny databas!\n"
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, 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:3502
+#: rpmdb/rpmdb.c:3643
#, c-format
msgid "removing directory %s\n"
msgstr "tar bort katalog %s\n"
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "kunde inte ta bort katalogen %s: %s\n"
diff --git a/po/tr.po b/po/tr.po
index b168a4d13..07a90bcf8 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -116,7 +116,7 @@ msgstr "<kmt>"
msgid "use <dir> as the top level directory"
msgstr "Üst düzey dizin olarak <dizin> kullanýlýr"
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr "<dizin>"
@@ -407,40 +407,40 @@ msgstr "--sign sadece paket oluþturulurken kullanýlabilir"
msgid "exec failed\n"
msgstr "icra baþarýsýz\n"
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr "yeniden oluþturmak için paket dosyalarý belirtilmemiþ"
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr "oluþturma için gerekli spec dosyasý belirtilmemiþ"
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr "oluþturma için gereken tar dosyalarý belirtilmemiþ"
-#: rpmqv.c:1061
+#: rpmqv.c:1063
#, fuzzy
msgid "no packages given for erase"
msgstr "yüklenecek paket(ler) belirtilmedi"
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr "yüklenecek paket(ler) belirtilmedi"
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr "sorgulama için hiç argüman belirtilmedi"
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr "denetleme için hiç argüman belirtilmedi"
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr "--querytags ile beklenmeyen girdiler"
-#: rpmqv.c:1155
+#: rpmqv.c:1157
#, fuzzy
msgid "no arguments given"
msgstr "sorgulama için hiç argüman belirtilmedi"
@@ -1635,43 +1635,44 @@ msgstr "%%%s dosyasýna yazýlamaz %s\n"
msgid "error creating temporary file %s\n"
msgstr "%s geçici dosyasý oluþturulurken hata\n"
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead baþarýsýz\n"
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr "RPM'nin bu sürümünde paket sürümü 1 desteklenmiyor\n"
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
"RPM'nin bu sürümünde sadece ilk sürüm rakamý <= 4 olan paketler "
"destekleniyor\n"
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature baþarýsýz\n"
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ýmza bulundurmuyor\n"
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead baþarýsýz\n"
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread baþarýsýz: %s\n"
@@ -1770,7 +1771,7 @@ msgstr "--replacepkgs --replacefiles için kýsaltma"
msgid "upgrade package(s) if already installed"
msgstr "paket(ler) kurulu ise paket(ler)i günceller"
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
msgid "<packagefile>+"
msgstr "<paketDosyasý>+"
@@ -1835,41 +1836,46 @@ msgstr "%%preun betiði (varsa) çalýþtýrýlmaz"
msgid "do not execute %%postun scriptlet (if any)"
msgstr "%%postun betiði (varsa) çalýþtýrýlmaz"
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
#, fuzzy
msgid "don't verify package digest(s)"
msgstr "paket baðýmlýlýklarý doðrulanmaz"
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "paket mimarisi denetlenmez"
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
#, fuzzy
msgid "don't verify package signature(s)"
msgstr "paket imzasýný denetler"
-#: lib/poptI.c:197
+#: lib/poptI.c:199
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "bu paket tarafýndan tetiklenen hiç bir betik çalýþtýrýlmaz"
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "hiçbir %%triggerprein betiði çalýþtýrýlmaz"
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "hiçbir %%triggerin betiði çalýþtýrýlmaz."
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "hiçbir %%triggerun betiði çalýþtýrýlmaz."
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "hiçbir %%triggerpostun betiði çalýþtýrýlmaz."
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -1877,49 +1883,49 @@ msgstr ""
"paketin eski bir sürüme güncellenmesini saðlar (--force ayný iþi otomatik "
"yapar)"
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr "kurulumun geliþimi yüzde olarak gösterilir"
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr "eðer deðitirilebiliyorsa paketin yerini <dizin>'e deðiþtirir"
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr "dosyalarý <eski> dizininden kaldýrýp <yeni> dizinine yerleþtirir"
-#: lib/poptI.c:223
+#: lib/poptI.c:225
msgid "<old>=<new>"
msgstr "<eski>=<yeni>"
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr "yeniden paketleme sýrasýnda silinen paket dosyalarýný kaydeder"
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr "paket dosyalarý mevcut dosyalarla yer deðiþtirse bile paketi kurar"
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr "paketi yeniden kurar"
-#: lib/poptI.c:234
+#: lib/poptI.c:236
#, fuzzy
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
"yeni paket(ler) kaldýrýlýr, geriye dönük eski paket(ler) yeniden kurulur"
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr "<tarih>"
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr "yükleme yapmaz, sadece çalýþýp çalýþmayacaðýný belirtir"
-#: lib/poptI.c:240
+#: lib/poptI.c:242
msgid "upgrade package(s)"
msgstr "paket günceller"
@@ -2050,77 +2056,77 @@ msgstr "listelenmiþ dosyalarýn durumunu gösterir"
msgid "display a verbose file listing"
msgstr "ayrýntýlý dosya listesi gösterir"
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
msgid "don't verify MD5 digest of files"
msgstr "dosyalarýn MD5 özümlemesi doðrulanmaz"
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
msgid "don't verify size of files"
msgstr "dosyalarýn uzunluklarý doðrulanmaz"
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
msgid "don't verify symlink path of files"
msgstr "dosyalarýn sembolik bað dosya yollarý doðrulanmaz"
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
msgid "don't verify owner of files"
msgstr "dosyalarýn sahipleri doðrulanmaz"
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
msgid "don't verify group of files"
msgstr "dosyalarýn gruplarý doðrulanmaz"
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr "dosyalarýn deðiþiklik zamanlarý doðrulanmaz"
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
msgid "don't verify mode of files"
msgstr "dosyalarýn kipleri doðrulanmaz"
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr "paketteki dosyalar doðrulanamaz"
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr "paket baðýmlýlýklarý doðrulanmaz"
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
#, fuzzy
msgid "don't execute verify script(s)"
msgstr "(varsa) %verifyscript çalýþtýrýlmaz"
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
#, fuzzy
msgid "don't verify GPG V3 DSA signature(s)"
msgstr "Baþlýk SHA1 özümlemesi doðrulanmaz"
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
#, fuzzy
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr "dosyalarýn MD5 özümlemesi doðrulanmaz"
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
#, fuzzy
msgid "sign package(s) (identical to --resign)"
msgstr "paketi imzalar (mevcut imza kaldýrýlýr)"
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
#, fuzzy
msgid "verify package signature(s)"
msgstr "paket imzasýný denetler"
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
#, fuzzy
msgid "sign package(s) (identical to --addsign)"
msgstr "paketi imzalar (mevcut imza kaldýrýlýr)"
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
msgid "generate signature"
msgstr "imza üretir"
@@ -2193,7 +2199,7 @@ msgstr "%s açýlamadý: %s\n"
msgid "%s failed: %s\n"
msgstr "%s baþarýsýz\n"
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr "biçem yanlýþ: %s\n"
@@ -2242,8 +2248,8 @@ msgstr "paket ne dosya sahibi ne de kimlik listesi içeriyor\n"
msgid "can't query %s: %s\n"
msgstr "%s sorgulanamýyor: %s\n"
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr "%s açýlamadý: %s\n"
@@ -2257,7 +2263,7 @@ msgstr "%s 'nin sorgulamasý baþarýsýzlýkla sonuçlandý\n"
msgid "old format source packages cannot be queried\n"
msgstr "eski biçem kaynak paketleri sorgulanamaz\n"
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, fuzzy, c-format
msgid "%s: not a package manifest: %s\n"
msgstr "%s tetikleyen paket yok\n"
@@ -2326,7 +2332,7 @@ msgstr "paket kayýt numarasý: %u\n"
msgid "record %u could not be read\n"
msgstr "%u. kayýt okunamadý\n"
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr "%s paketi kurulu deðil\n"
@@ -2500,83 +2506,83 @@ msgstr "Hazýrlanýyor..."
msgid "Preparing packages for installation..."
msgstr "Kurulacak paketler hazýrlanýyor..."
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr "%s alýnýyor\n"
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr "... %s olarak\n"
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr "%s atlanýyor - aktarým baþarýsýz - %s\n"
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr "%s paketi yeniden konumlandýrýlamaz\n"
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr "%s dosyasýndan okuma hatalý\n"
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr "%s dosyasý RPM'nin daha yeni bir sürümünü gerektiriyor\n"
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s yüklenemedi\n"
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr "%d kaynak ve %d icra edilebilir paketi bulundu\n"
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
#, fuzzy
msgid "Failed dependencies:\n"
msgstr "baðýmlýlýklarda hata; gerekli paketler:\n"
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr "icra edilebilir paketleri kuruluyor\n"
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, c-format
msgid "cannot open file %s: %s\n"
msgstr "%s dosyasý açýlamadý: %s\n"
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr "\"%s\" birden fazla paketi tanýmlýyor\n"
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, c-format
msgid "cannot open %s: %s\n"
msgstr "%s açýlamadý: %s\n"
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr "%s kuruluyor\n"
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2793,13 +2799,13 @@ msgstr "%s okuma eriþimi için açýlamadý: %s.\n"
msgid "cannot open Packages database in %s\n"
msgstr "%s de Paket veritabaný açýlamadý\n"
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, fuzzy, c-format
msgid "cannot open Solve database in %s\n"
msgstr "%s dizininde rpm veritabaný açýlamýyor\n"
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr "baðlý dosya sistemlerinin listesi alýnýyor\n"
@@ -3004,11 +3010,11 @@ msgid "install/erase %d elements\n"
msgstr ""
#: lib/verify.c:288
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+msgid "missing %c %s"
msgstr "eksik %s"
-#: lib/verify.c:389
+#: lib/verify.c:395
#, fuzzy, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr "%s-%s-%s için tatmin edici olmayan baðýmlýlýklar: "
@@ -3184,166 +3190,181 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr "(eski) rpm[23] paketleme ile uyumlu baþlýklarý üretir"
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr "dbiTagsInit: tanýmlanmamýþ etiket adý: \"%s\" yoksayýldý\n"
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr "%s indeksi db%d - %s (%d) kullanarak açýlamadý\n"
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, c-format
msgid "cannot open %s index\n"
msgstr "%s indeksi açýlamadý\n"
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr "belirtilmiþ bir dbpath deðeri yok\n"
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, 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:1449
+#: rpmdb/rpmdb.c:1527
#, 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:2033
+#: rpmdb/rpmdb.c:2127
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "h#%6u: already checked.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2136
+#, fuzzy, c-format
+msgid "h#%6u: %s"
+msgstr "dosya %s: %s\n"
+
+#: rpmdb/rpmdb.c:2142
+#, fuzzy, c-format
+msgid "rpmdb: header #%u: %s -- skipping.\n"
msgstr "rpmdb: bozuk baþlýk örneði #%u alýndý, atlanýyor.\n"
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2163
+#, 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:2437
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: 0x%x de baþlýk okunamadý\n"
-#: rpmdb/rpmdb.c:2365
+#: rpmdb/rpmdb.c:2500
#, 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:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr "\"%s\" %s indeksinden siliniyor.\n"
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr "%d girdi %s indeksinden siliniyor.\n"
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, 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:2533
+#: rpmdb/rpmdb.c:2668
#, 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:2543
+#: rpmdb/rpmdb.c:2678
#, 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:2690
+#: rpmdb/rpmdb.c:2827
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr "yeni paket örneðini tutma hatasý(%d)\n"
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr "\"%s\" %s indeksine ekleniyor.\n"
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr "%d girdi %s indeksine ekleniyor.\n"
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, 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:3297
+#: rpmdb/rpmdb.c:3434
#, 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:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr "belirtilmiþ bir dbpath yok"
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr "%s veritabaný %s içinde yeniden oluþturuluyor\n"
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr "geçici veritabaný %s zaten mevcut\n"
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, c-format
msgid "creating directory %s\n"
msgstr "%s dizini oluþturuluyor\n"
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, c-format
msgid "creating directory %s: %s\n"
msgstr "%s dizini oluþturuluyor: %s\n"
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr "eski veritabaný dbapi %d ile açýlýyor\n"
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr "yeni veritabaný dbapi %d ile açýlýyor\n"
-#: rpmdb/rpmdb.c:3424
-#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+#: rpmdb/rpmdb.c:3565
+#, 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:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "kayýt özgün olarak %u e eklenemedi\n"
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
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:3490
+#: rpmdb/rpmdb.c:3631
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:3492
+#: rpmdb/rpmdb.c:3633
#, 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:3502
+#: rpmdb/rpmdb.c:3643
#, c-format
msgid "removing directory %s\n"
msgstr "%s dizini siliniyor\n"
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr "%s dizininin silinmesi baþarýsýz: %s\n"
diff --git a/po/uk.po b/po/uk.po
index 43b65b50f..14b69f830 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -392,39 +392,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1063
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1157
msgid "no arguments given"
msgstr ""
@@ -1584,41 +1584,42 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -1711,7 +1712,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
msgid "<packagefile>+"
msgstr ""
@@ -1775,85 +1776,89 @@ msgstr ""
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:199
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:223
+#: lib/poptI.c:225
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:240
+#: lib/poptI.c:242
msgid "upgrade package(s)"
msgstr ""
@@ -1976,71 +1981,71 @@ msgstr ""
msgid "display a verbose file listing"
msgstr ""
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
msgid "don't verify MD5 digest of files"
msgstr ""
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
msgid "don't execute verify script(s)"
msgstr ""
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
msgid "don't verify GPG V3 DSA signature(s)"
msgstr ""
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr ""
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
msgid "sign package(s) (identical to --resign)"
msgstr ""
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
msgid "verify package signature(s)"
msgstr ""
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
msgid "sign package(s) (identical to --addsign)"
msgstr ""
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
msgid "generate signature"
msgstr ""
@@ -2113,7 +2118,7 @@ msgstr ""
msgid "%s failed: %s\n"
msgstr ""
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
@@ -2161,8 +2166,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2176,7 +2181,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2245,7 +2250,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2415,82 +2420,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2706,13 +2711,13 @@ msgstr ""
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, c-format
msgid "cannot open Solve database in %s\n"
msgstr ""
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -2914,10 +2919,10 @@ msgstr ""
#: lib/verify.c:288
#, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:389
+#: lib/verify.c:395
#, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr ""
@@ -3093,164 +3098,179 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr ""
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, c-format
msgid "cannot open %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "h#%6u: already checked.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2136
+#, c-format
+msgid "h#%6u: %s"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2142
+#, c-format
+msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2365
+#: rpmdb/rpmdb.c:2500
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2533
+#: rpmdb/rpmdb.c:2668
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 43b65b50f..14b69f830 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -392,39 +392,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1063
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1157
msgid "no arguments given"
msgstr ""
@@ -1584,41 +1584,42 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -1711,7 +1712,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
msgid "<packagefile>+"
msgstr ""
@@ -1775,85 +1776,89 @@ msgstr ""
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:199
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:223
+#: lib/poptI.c:225
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:240
+#: lib/poptI.c:242
msgid "upgrade package(s)"
msgstr ""
@@ -1976,71 +1981,71 @@ msgstr ""
msgid "display a verbose file listing"
msgstr ""
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
msgid "don't verify MD5 digest of files"
msgstr ""
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
msgid "don't execute verify script(s)"
msgstr ""
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
msgid "don't verify GPG V3 DSA signature(s)"
msgstr ""
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr ""
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
msgid "sign package(s) (identical to --resign)"
msgstr ""
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
msgid "verify package signature(s)"
msgstr ""
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
msgid "sign package(s) (identical to --addsign)"
msgstr ""
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
msgid "generate signature"
msgstr ""
@@ -2113,7 +2118,7 @@ msgstr ""
msgid "%s failed: %s\n"
msgstr ""
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
@@ -2161,8 +2166,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2176,7 +2181,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2245,7 +2250,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2415,82 +2420,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2706,13 +2711,13 @@ msgstr ""
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, c-format
msgid "cannot open Solve database in %s\n"
msgstr ""
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -2914,10 +2919,10 @@ msgstr ""
#: lib/verify.c:288
#, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:389
+#: lib/verify.c:395
#, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr ""
@@ -3093,164 +3098,179 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr ""
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, c-format
msgid "cannot open %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "h#%6u: already checked.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2136
+#, c-format
+msgid "h#%6u: %s"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2142
+#, c-format
+msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2365
+#: rpmdb/rpmdb.c:2500
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2533
+#: rpmdb/rpmdb.c:2668
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 43b65b50f..14b69f830 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -392,39 +392,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1063
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1157
msgid "no arguments given"
msgstr ""
@@ -1584,41 +1584,42 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -1711,7 +1712,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
msgid "<packagefile>+"
msgstr ""
@@ -1775,85 +1776,89 @@ msgstr ""
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:199
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:223
+#: lib/poptI.c:225
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:240
+#: lib/poptI.c:242
msgid "upgrade package(s)"
msgstr ""
@@ -1976,71 +1981,71 @@ msgstr ""
msgid "display a verbose file listing"
msgstr ""
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
msgid "don't verify MD5 digest of files"
msgstr ""
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
msgid "don't execute verify script(s)"
msgstr ""
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
msgid "don't verify GPG V3 DSA signature(s)"
msgstr ""
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr ""
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
msgid "sign package(s) (identical to --resign)"
msgstr ""
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
msgid "verify package signature(s)"
msgstr ""
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
msgid "sign package(s) (identical to --addsign)"
msgstr ""
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
msgid "generate signature"
msgstr ""
@@ -2113,7 +2118,7 @@ msgstr ""
msgid "%s failed: %s\n"
msgstr ""
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
@@ -2161,8 +2166,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2176,7 +2181,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2245,7 +2250,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2415,82 +2420,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2706,13 +2711,13 @@ msgstr ""
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, c-format
msgid "cannot open Solve database in %s\n"
msgstr ""
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -2914,10 +2919,10 @@ msgstr ""
#: lib/verify.c:288
#, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:389
+#: lib/verify.c:395
#, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr ""
@@ -3093,164 +3098,179 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr ""
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, c-format
msgid "cannot open %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "h#%6u: already checked.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2136
+#, c-format
+msgid "h#%6u: %s"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2142
+#, c-format
+msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2365
+#: rpmdb/rpmdb.c:2500
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2533
+#: rpmdb/rpmdb.c:2668
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, 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 43b65b50f..14b69f830 100644
--- 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-07-21 18:09-0400\n"
+"POT-Creation-Date: 2002-07-24 12:18-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"
@@ -118,7 +118,7 @@ msgstr ""
msgid "use <dir> as the top level directory"
msgstr ""
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:220
+#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
msgid "<dir>"
msgstr ""
@@ -392,39 +392,39 @@ msgstr ""
msgid "exec failed\n"
msgstr ""
-#: rpmqv.c:969
+#: rpmqv.c:971
msgid "no packages files given for rebuild"
msgstr ""
-#: rpmqv.c:1037
+#: rpmqv.c:1039
msgid "no spec files given for build"
msgstr ""
-#: rpmqv.c:1039
+#: rpmqv.c:1041
msgid "no tar files given for build"
msgstr ""
-#: rpmqv.c:1061
+#: rpmqv.c:1063
msgid "no packages given for erase"
msgstr ""
-#: rpmqv.c:1102
+#: rpmqv.c:1104
msgid "no packages given for install"
msgstr ""
-#: rpmqv.c:1118
+#: rpmqv.c:1120
msgid "no arguments given for query"
msgstr ""
-#: rpmqv.c:1131
+#: rpmqv.c:1133
msgid "no arguments given for verify"
msgstr ""
-#: rpmqv.c:1139
+#: rpmqv.c:1141
msgid "unexpected arguments to --querytags "
msgstr ""
-#: rpmqv.c:1155
+#: rpmqv.c:1157
msgid "no arguments given"
msgstr ""
@@ -1584,41 +1584,42 @@ msgstr ""
msgid "error creating temporary file %s\n"
msgstr ""
-#: lib/package.c:222 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:436 lib/package.c:476 lib/package.c:695 lib/package.c:719
+#: lib/package.c:749 lib/rpmchecksig.c:767
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
+#: lib/package.c:578 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/package.c:237
+#: lib/package.c:593
msgid "packaging version 1 is not supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:245
+#: lib/package.c:601
msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:254 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:610 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:258 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:614 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:305 lib/rpmchecksig.c:586
+#: lib/package.c:661 lib/rpmchecksig.c:586
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:340 lib/package.c:365 lib/package.c:395 lib/rpmchecksig.c:767
-#, c-format
-msgid "only V3 signatures can be verified, skipping V%u signature"
-msgstr ""
-
-#: lib/package.c:407 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:761 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -1711,7 +1712,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:241
+#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
msgid "<packagefile>+"
msgstr ""
@@ -1775,85 +1776,89 @@ msgstr ""
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:191 lib/poptQV.c:274 lib/poptQV.c:311
+#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptI.c:193 lib/poptQV.c:277 lib/poptQV.c:313
+#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:199
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:200
+#: lib/poptI.c:202
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:203
+#: lib/poptI.c:205
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:206
+#: lib/poptI.c:208
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:209
+#: lib/poptI.c:211
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:215
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:217
+#: lib/poptI.c:219
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:221
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:224
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:223
+#: lib/poptI.c:225
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:226
+#: lib/poptI.c:228
msgid "save erased package files by repackaging"
msgstr ""
-#: lib/poptI.c:229
+#: lib/poptI.c:231
msgid "install even if the package replaces installed files"
msgstr ""
-#: lib/poptI.c:232
+#: lib/poptI.c:234
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:234
+#: lib/poptI.c:236
msgid "deinstall new, reinstall old, package(s), back to <date>"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:237
msgid "<date>"
msgstr ""
-#: lib/poptI.c:237
+#: lib/poptI.c:239
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:240
+#: lib/poptI.c:242
msgid "upgrade package(s)"
msgstr ""
@@ -1976,71 +1981,71 @@ msgstr ""
msgid "display a verbose file listing"
msgstr ""
-#: lib/poptQV.c:239
+#: lib/poptQV.c:233
msgid "don't verify MD5 digest of files"
msgstr ""
-#: lib/poptQV.c:242
+#: lib/poptQV.c:236
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:245
+#: lib/poptQV.c:239
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:248
+#: lib/poptQV.c:242
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:251
+#: lib/poptQV.c:245
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:254
+#: lib/poptQV.c:248
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:257 lib/poptQV.c:260
+#: lib/poptQV.c:251 lib/poptQV.c:254
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:263
+#: lib/poptQV.c:257
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:265 tools/rpmgraph.c:274
+#: lib/poptQV.c:259 tools/rpmgraph.c:274
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:267 lib/poptQV.c:271
+#: lib/poptQV.c:261 lib/poptQV.c:265
msgid "don't execute verify script(s)"
msgstr ""
-#: lib/poptQV.c:282
+#: lib/poptQV.c:279
msgid "don't verify GPG V3 DSA signature(s)"
msgstr ""
-#: lib/poptQV.c:285
+#: lib/poptQV.c:282
msgid "don't verify PGP V3 RSA/MD5 signature(s)"
msgstr ""
-#: lib/poptQV.c:300
+#: lib/poptQV.c:297
msgid "sign package(s) (identical to --resign)"
msgstr ""
-#: lib/poptQV.c:302
+#: lib/poptQV.c:299
msgid "verify package signature(s)"
msgstr ""
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
msgid "import an armored public key"
msgstr ""
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
msgid "sign package(s) (identical to --addsign)"
msgstr ""
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
msgid "generate signature"
msgstr ""
@@ -2113,7 +2118,7 @@ msgstr ""
msgid "%s failed: %s\n"
msgstr ""
-#: lib/query.c:122 lib/rpmts.c:392
+#: lib/query.c:122 lib/rpmts.c:413
#, c-format
msgid "incorrect format: %s\n"
msgstr ""
@@ -2161,8 +2166,8 @@ msgstr ""
msgid "can't query %s: %s\n"
msgstr ""
-#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:361 lib/rpminstall.c:492
-#: lib/rpminstall.c:881 tools/rpmgraph.c:127 tools/rpmgraph.c:164
+#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:368 lib/rpminstall.c:499
+#: lib/rpminstall.c:899 tools/rpmgraph.c:127 tools/rpmgraph.c:164
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -2176,7 +2181,7 @@ msgstr ""
msgid "old format source packages cannot be queried\n"
msgstr ""
-#: lib/query.c:609 lib/rpminstall.c:505
+#: lib/query.c:609 lib/rpminstall.c:512
#, c-format
msgid "%s: not a package manifest: %s\n"
msgstr ""
@@ -2245,7 +2250,7 @@ msgstr ""
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:907 lib/rpminstall.c:662
+#: lib/query.c:907 lib/rpminstall.c:680
#, c-format
msgid "package %s is not installed\n"
msgstr ""
@@ -2415,82 +2420,82 @@ msgstr ""
msgid "Preparing packages for installation..."
msgstr ""
-#: lib/rpminstall.c:308
+#: lib/rpminstall.c:315
#, c-format
msgid "Retrieving %s\n"
msgstr ""
#. XXX undefined %{name}/%{version}/%{release} here
#. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:321
+#: lib/rpminstall.c:328
#, c-format
msgid " ... as %s\n"
msgstr ""
-#: lib/rpminstall.c:325
+#: lib/rpminstall.c:332
#, c-format
msgid "skipping %s - transfer failed - %s\n"
msgstr ""
-#: lib/rpminstall.c:416
+#: lib/rpminstall.c:423
#, c-format
msgid "package %s is not relocateable\n"
msgstr ""
-#: lib/rpminstall.c:466
+#: lib/rpminstall.c:473
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:472
+#: lib/rpminstall.c:479
#, c-format
msgid "file %s requires a newer version of RPM\n"
msgstr ""
-#: lib/rpminstall.c:484 lib/rpminstall.c:737 tools/rpmgraph.c:156
+#: lib/rpminstall.c:491 lib/rpminstall.c:755 tools/rpmgraph.c:156
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:527
#, c-format
msgid "found %d source and %d binary packages\n"
msgstr ""
-#: lib/rpminstall.c:534 lib/rpminstall.c:690 lib/rpminstall.c:1068
+#: lib/rpminstall.c:541 lib/rpminstall.c:708 lib/rpminstall.c:1086
#: tools/rpmgraph.c:202
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:541 tools/rpmgraph.c:208
+#: lib/rpminstall.c:548 tools/rpmgraph.c:208
msgid " Suggested resolutions:\n"
msgstr ""
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:578
msgid "installing binary packages\n"
msgstr ""
-#: lib/rpminstall.c:595
+#: lib/rpminstall.c:602
#, c-format
msgid "cannot open file %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:665
+#: lib/rpminstall.c:683
#, c-format
msgid "\"%s\" specifies multiple packages\n"
msgstr ""
-#: lib/rpminstall.c:724
+#: lib/rpminstall.c:742
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:730
+#: lib/rpminstall.c:748
#, c-format
msgid "Installing %s\n"
msgstr ""
-#: lib/rpminstall.c:1062
+#: lib/rpminstall.c:1080
#, c-format
msgid "rollback %d packages to %s"
msgstr ""
@@ -2706,13 +2711,13 @@ msgstr ""
msgid "cannot open Packages database in %s\n"
msgstr ""
-#: lib/rpmts.c:298
+#: lib/rpmts.c:319
#, c-format
msgid "cannot open Solve database in %s\n"
msgstr ""
#. Get available space on mounted file systems.
-#: lib/rpmts.c:776
+#: lib/rpmts.c:797
msgid "getting list of mounted filesystems\n"
msgstr ""
@@ -2914,10 +2919,10 @@ msgstr ""
#: lib/verify.c:288
#, c-format
-msgid "missing %s"
+msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:389
+#: lib/verify.c:395
#, c-format
msgid "Unsatisfied dependencies for %s: "
msgstr ""
@@ -3093,164 +3098,179 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
msgstr ""
#. @-modfilesys@
-#: rpmdb/rpmdb.c:164
+#: rpmdb/rpmdb.c:213
#, c-format
msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
msgstr ""
-#: rpmdb/rpmdb.c:239
+#: rpmdb/rpmdb.c:288
#, c-format
msgid "cannot open %s index using db%d - %s (%d)\n"
msgstr ""
-#: rpmdb/rpmdb.c:261
+#: rpmdb/rpmdb.c:310
#, c-format
msgid "cannot open %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:736
+#: rpmdb/rpmdb.c:797
msgid "no dbpath has been set\n"
msgstr ""
-#: rpmdb/rpmdb.c:1034 rpmdb/rpmdb.c:1167 rpmdb/rpmdb.c:1217 rpmdb/rpmdb.c:2113
-#: rpmdb/rpmdb.c:2219 rpmdb/rpmdb.c:2929
+#: rpmdb/rpmdb.c:1095 rpmdb/rpmdb.c:1228 rpmdb/rpmdb.c:1278 rpmdb/rpmdb.c:2243
+#: rpmdb/rpmdb.c:2349 rpmdb/rpmdb.c:3066
#, c-format
msgid "error(%d) getting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:1449
+#: rpmdb/rpmdb.c:1527
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2033
+#: rpmdb/rpmdb.c:2127
#, c-format
-msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
+msgid "h#%6u: already checked.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2302
+#: rpmdb/rpmdb.c:2136
+#, c-format
+msgid "h#%6u: %s"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2142
+#, c-format
+msgid "rpmdb: header #%u: %s -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2163
+#, c-format
+msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
+msgstr ""
+
+#: rpmdb/rpmdb.c:2437
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: rpmdb/rpmdb.c:2365
+#: rpmdb/rpmdb.c:2500
#, c-format
msgid "error(%d) setting header #%d record for %s removal\n"
msgstr ""
-#: rpmdb/rpmdb.c:2480
+#: rpmdb/rpmdb.c:2615
#, c-format
msgid "removing \"%s\" from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2484
+#: rpmdb/rpmdb.c:2619
#, c-format
msgid "removing %d entries from %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2512
+#: rpmdb/rpmdb.c:2647
#, c-format
msgid "error(%d) setting \"%s\" records from %s index\n"
msgstr ""
-#: rpmdb/rpmdb.c:2533
+#: rpmdb/rpmdb.c:2668
#, c-format
msgid "error(%d) storing record \"%s\" into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2543
+#: rpmdb/rpmdb.c:2678
#, c-format
msgid "error(%d) removing record \"%s\" from %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:2690
+#: rpmdb/rpmdb.c:2827
#, c-format
msgid "error(%d) allocating new package instance\n"
msgstr ""
-#: rpmdb/rpmdb.c:2904
+#: rpmdb/rpmdb.c:3041
#, c-format
msgid "adding \"%s\" to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2908
+#: rpmdb/rpmdb.c:3045
#, c-format
msgid "adding %d entries to %s index.\n"
msgstr ""
-#: rpmdb/rpmdb.c:2948
+#: rpmdb/rpmdb.c:3085
#, c-format
msgid "error(%d) storing record %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3297
+#: rpmdb/rpmdb.c:3434
#, c-format
msgid "removing %s after successful db3 rebuild.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3334
+#: rpmdb/rpmdb.c:3472
msgid "no dbpath has been set"
msgstr ""
-#: rpmdb/rpmdb.c:3366
+#: rpmdb/rpmdb.c:3504
#, c-format
msgid "rebuilding database %s into %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3370
+#: rpmdb/rpmdb.c:3508
#, c-format
msgid "temporary database %s already exists\n"
msgstr ""
-#: rpmdb/rpmdb.c:3376
+#: rpmdb/rpmdb.c:3514
#, c-format
msgid "creating directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3378
+#: rpmdb/rpmdb.c:3516
#, c-format
msgid "creating directory %s: %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3385
+#: rpmdb/rpmdb.c:3523
#, c-format
msgid "opening old database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3398
+#: rpmdb/rpmdb.c:3536
#, c-format
msgid "opening new database with dbapi %d\n"
msgstr ""
-#: rpmdb/rpmdb.c:3424
+#: rpmdb/rpmdb.c:3565
#, c-format
-msgid "record number %u in database is bad -- skipping.\n"
+msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: rpmdb/rpmdb.c:3464
+#: rpmdb/rpmdb.c:3605
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: rpmdb/rpmdb.c:3482
+#: rpmdb/rpmdb.c:3623
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3631
msgid "failed to replace old database with new database!\n"
msgstr ""
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3633
#, c-format
msgid "replace files in %s with files from %s to recover"
msgstr ""
-#: rpmdb/rpmdb.c:3502
+#: rpmdb/rpmdb.c:3643
#, c-format
msgid "removing directory %s\n"
msgstr ""
-#: rpmdb/rpmdb.c:3504
+#: rpmdb/rpmdb.c:3645
#, c-format
msgid "failed to remove directory %s: %s\n"
msgstr ""
diff --git a/popt/poptint.h b/popt/poptint.h
index a4f9147d6..e612e925e 100644
--- a/popt/poptint.h
+++ b/popt/poptint.h
@@ -23,17 +23,17 @@ _free(/*@only@*/ /*@null@*/ const void * p)
}
/* Bit mask macros. */
-/*@-exporttype@*/
+/*@-exporttype -redef @*/
typedef unsigned int __pbm_bits;
-/*@=exporttype@*/
+/*@=exporttype =redef @*/
#define __PBM_NBITS (8 * sizeof (__pbm_bits))
#define __PBM_IX(d) ((d) / __PBM_NBITS)
#define __PBM_MASK(d) ((__pbm_bits) 1 << (((unsigned)(d)) % __PBM_NBITS))
-/*@-exporttype@*/
+/*@-exporttype -redef @*/
typedef struct {
__pbm_bits bits[1];
} pbm_set;
-/*@=exporttype@*/
+/*@=exporttype =redef @*/
#define __PBM_BITS(set) ((set)->bits)
#define PBM_ALLOC(d) calloc(__PBM_IX (d) + 1, sizeof(__pbm_bits))
diff --git a/python/rpmdb-py.c b/python/rpmdb-py.c
index e1da8274c..4921fcea1 100644
--- a/python/rpmdb-py.c
+++ b/python/rpmdb-py.c
@@ -312,14 +312,15 @@ rpmdbObject * rpmOpenDB(/*@unused@*/ PyObject * self, PyObject * args) {
}
/**
+ * @todo Permit header checks when doing --rebuilddb.
*/
PyObject * rebuildDB (/*@unused@*/ PyObject * self, PyObject * args)
{
- char * root = "";
+ char * rootDir = "";
- if (!PyArg_ParseTuple(args, "s", &root)) return NULL;
+ if (!PyArg_ParseTuple(args, "s", &rootDir)) return NULL;
- return Py_BuildValue("i", rpmdbRebuild(root));
+ return Py_BuildValue("i", rpmdbRebuild(rootDir, NULL, NULL));
}
/*@}*/
diff --git a/rpm.spec.in b/rpm.spec.in
index eaa3967e5..830230045 100644
--- 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.52
+Release: 0.54
Group: System Environment/Base
Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
Copyright: GPL
@@ -514,6 +514,12 @@ fi
%{__prefix}/include/popt.h
%changelog
+* Wed Jul 24 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.54
+- imbue %ghost with missingok attribute with --verify (#68933).
+
+* Tue Jul 23 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.53
+- verify signatures/digests retrieved through rpmdbNextIterator().
+
* Sun Jul 21 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.52
- add methods to make signature handling opaque wrto rpmts.
diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c
index 538766456..e30c3ab31 100644
--- a/rpmdb/rpmdb.c
+++ b/rpmdb/rpmdb.c
@@ -44,6 +44,7 @@ extern void regfree (/*@only@*/ regex_t *preg)
/*@access dbiIndexSet@*/
/*@access dbiIndexItem@*/
+/*@access rpmts@*/ /* XXX compared with NULL */
/*@access Header@*/ /* XXX compared with NULL */
/*@access rpmdbMatchIterator@*/
/*@access pgpDig@*/
@@ -62,6 +63,54 @@ static int _db_filter_dups = 0;
/*@unchecked@*/
int dbiTagsMax = 0;
+/* Bit mask macros. */
+/*@-exporttype@*/
+typedef unsigned int __pbm_bits;
+/*@=exporttype@*/
+#define __PBM_NBITS (8 * sizeof (__pbm_bits))
+#define __PBM_IX(d) ((d) / __PBM_NBITS)
+#define __PBM_MASK(d) ((__pbm_bits) 1 << (((unsigned)(d)) % __PBM_NBITS))
+/*@-exporttype@*/
+typedef struct {
+ __pbm_bits bits[1];
+} pbm_set;
+/*@=exporttype@*/
+#define __PBM_BITS(set) ((set)->bits)
+
+#define PBM_FREE(s) _free(s);
+#define PBM_SET(d, s) (__PBM_BITS (s)[__PBM_IX (d)] |= __PBM_MASK (d))
+#define PBM_CLR(d, s) (__PBM_BITS (s)[__PBM_IX (d)] &= ~__PBM_MASK (d))
+#define PBM_ISSET(d, s) ((__PBM_BITS (s)[__PBM_IX (d)] & __PBM_MASK (d)) != 0)
+
+#define PBM_ALLOC(d) xcalloc(__PBM_IX (d) + 1, sizeof(__pbm_bits))
+
+/**
+ * Reallocate a bit map.
+ * @retval sp address of bit map pointer
+ * @retval odp no. of bits in map
+ * @param nd desired no. of bits
+ */
+/*@unused@*/
+static inline pbm_set * PBM_REALLOC(pbm_set ** sp, int * odp, int nd)
+ /*@modifies *sp, *odp @*/
+{
+ int i, nb;
+
+/*@-bounds -sizeoftype@*/
+ if (nd > (*odp)) {
+ nd *= 2;
+ nb = __PBM_IX(nd) + 1;
+ *sp = xrealloc(*sp, nb * sizeof(__pbm_bits));
+ for (i = __PBM_IX(*odp) + 1; i < nb; i++)
+ __PBM_BITS(*sp)[i] = 0;
+ *odp = nd;
+ }
+/*@=bounds =sizeoftype@*/
+/*@-compdef -retalias -usereleased@*/
+ return *sp;
+/*@=compdef =retalias =usereleased@*/
+}
+
/**
* Convert hex to binary nibble.
* @param c hex character
@@ -287,9 +336,20 @@ dbiIndex dbiOpen(rpmdb db, rpmTag rpmtag, /*@unused@*/ unsigned int flags)
}
exit:
- if (rc == 0 && dbi)
+ if (dbi != NULL && rc == 0) {
db->_dbi[dbix] = dbi;
- else
+/*@-sizeoftype@*/
+ if (rpmtag == RPMDBI_PACKAGES && db->db_bits == NULL) {
+ db->db_nbits = 1024;
+ if (!dbiStat(dbi, DB_FAST_STAT)) {
+ DB_HASH_STAT * hash = (DB_HASH_STAT *)dbi->dbi_stats;
+ if (hash)
+ db->db_nbits += hash->hash_nkeys;
+ }
+ db->db_bits = PBM_ALLOC(db->db_nbits);
+ }
+/*@=sizeoftype@*/
+ } else
dbi = db3Free(dbi);
/*@-compdef -nullstate@*/ /* FIX: db->_dbi may be NULL */
@@ -675,6 +735,7 @@ int rpmdbClose(rpmdb db)
db->db_errpfx = _free(db->db_errpfx);
db->db_root = _free(db->db_root);
db->db_home = _free(db->db_home);
+ db->db_bits = PBM_FREE(db->db_bits);
db->_dbi = _free(db->_dbi);
/*@-refcounttrans@*/ db = _free(db); /*@=refcounttrans@*/
/*@=usereleased@*/
@@ -1412,6 +1473,12 @@ struct _rpmdbMatchIterator {
int mi_nre;
/*@only@*/ /*@null@*/
miRE mi_re;
+/*@null@*/
+ rpmts mi_ts;
+/*@null@*/
+ rpmRC (*mi_hdrchk) (rpmts ts, const void * uh, size_t uc, const char ** msg)
+ /*@modifies ts, *msg @*/;
+
};
/**
@@ -1441,6 +1508,17 @@ static int miFreeHeader(rpmdbMatchIterator mi, dbiIndex dbi)
key->size = sizeof(mi->mi_prevoffset);
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) {
+ const char * msg = NULL;
+ rpmRC rpmrc;
+ rpmrc = (*mi->mi_hdrchk) (mi->mi_ts, data->data, data->size, &msg);
+ msg = _free(msg);
+ }
+#endif
+
if (data->data != NULL) {
(void) blockSignals(dbi->dbi_rpmdb, &signalMask);
rc = dbiPut(dbi, mi->mi_dbc, key, data, DB_KEYLAST);
@@ -1879,7 +1957,8 @@ static int mireSkip (const rpmdbMatchIterator mi)
return (ntags == nmatches ? 0 : 1);
}
-int rpmdbSetIteratorRewrite(rpmdbMatchIterator mi, int rewrite) {
+int rpmdbSetIteratorRewrite(rpmdbMatchIterator mi, int rewrite)
+{
int rc;
if (mi == NULL)
return 0;
@@ -1891,7 +1970,8 @@ int rpmdbSetIteratorRewrite(rpmdbMatchIterator mi, int rewrite) {
return rc;
}
-int rpmdbSetIteratorModified(rpmdbMatchIterator mi, int modified) {
+int rpmdbSetIteratorModified(rpmdbMatchIterator mi, int modified)
+{
int rc;
if (mi == NULL)
return 0;
@@ -1900,6 +1980,20 @@ int rpmdbSetIteratorModified(rpmdbMatchIterator mi, int modified) {
return rc;
}
+int rpmdbSetHdrChk(rpmdbMatchIterator mi, rpmts ts,
+ rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, const char ** msg))
+{
+ int rc = 0;
+ if (mi == NULL)
+ return 0;
+/*@-assignexpose -newreftrans @*/
+/*@i@*/ mi->mi_ts = ts;
+ mi->mi_hdrchk = hdrchk;
+/*@=assignexpose =newreftrans @*/
+ return rc;
+}
+
+
/*@-nullstate@*/ /* FIX: mi->mi_key.data may be NULL */
Header rpmdbNextIterator(rpmdbMatchIterator mi)
{
@@ -2018,6 +2112,42 @@ top:
if (uh == NULL)
return NULL;
+ /* Check header digest/signature once (if requested). */
+/*@-boundsread -branchstate -sizeoftype @*/
+ if (mi->mi_ts && mi->mi_hdrchk) {
+ const char * msg = NULL;
+ pbm_set * set = NULL;
+ rpmRC rpmrc = RPMRC_NOTFOUND;
+
+ 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#%6u: already checked.\n"),
+ mi->mi_offset);
+#endif
+ rpmrc = RPMRC_OK;
+ }
+ }
+ if (rpmrc == RPMRC_NOTFOUND) {
+ rpmrc = (*mi->mi_hdrchk) (mi->mi_ts, uh, uhlen, &msg);
+ if (msg)
+ rpmMessage(RPMMESS_DEBUG, _("h#%6u: %s"),
+ mi->mi_offset, msg);
+ if (set && rpmrc == RPMRC_OK)
+ PBM_SET(mi->mi_offset, set);
+ }
+ 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 @*/
+
/* Did the header blob load correctly? */
#if !defined(_USE_COPY_LOAD)
/*@-onlytrans@*/
@@ -2030,7 +2160,7 @@ top:
#endif
if (mi->mi_h == NULL || !headerIsEntry(mi->mi_h, RPMTAG_NAME)) {
rpmError(RPMERR_BADHEADER,
- _("rpmdb: damaged header instance #%u retrieved, skipping.\n"),
+ _("rpmdb: damaged header #%u retrieved -- skipping.\n"),
mi->mi_offset);
goto top;
}
@@ -2266,13 +2396,18 @@ if (rc == 0)
mi->mi_nre = 0;
mi->mi_re = NULL;
+ mi->mi_ts = NULL;
+ mi->mi_hdrchk = NULL;
+
/*@-nullret@*/ /* FIX: mi->mi_key.data may be NULL */
return mi;
/*@=nullret@*/
}
/* XXX psm.c */
-int rpmdbRemove(rpmdb db, /*@unused@*/ int rid, unsigned int hdrNum)
+int rpmdbRemove(rpmdb db, /*@unused@*/ int rid, unsigned int hdrNum,
+ /*@unused@*/ rpmts ts,
+ /*@unused@*/ rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, const char ** msg))
{
DBC * dbcursor = NULL;
DBT * key = alloca(sizeof(*key));
@@ -2576,7 +2711,9 @@ if (key->size == 0) key->size++; /* XXX "/" fixup. */
}
/* XXX install.c */
-int rpmdbAdd(rpmdb db, int iid, Header h)
+int rpmdbAdd(rpmdb db, int iid, Header h,
+ /*@unused@*/ rpmts ts,
+ /*@unused@*/ rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, const char ** msg))
{
DBC * dbcursor = NULL;
DBT * key = alloca(sizeof(*key));
@@ -3299,7 +3436,8 @@ static int rpmdbMoveDatabase(const char * prefix,
return rc;
}
-int rpmdbRebuild(const char * prefix)
+int rpmdbRebuild(const char * prefix, rpmts ts,
+ rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, const char ** msg))
/*@globals _rebuildinprogress @*/
/*@modifies _rebuildinprogress @*/
{
@@ -3412,6 +3550,9 @@ int rpmdbRebuild(const char * prefix)
/* RPMDBI_PACKAGES */
mi = rpmdbInitIterator(olddb, RPMDBI_PACKAGES, NULL, 0);
+ if (ts && hdrchk)
+ (void) rpmdbSetHdrChk(mi, ts, hdrchk);
+
while ((h = rpmdbNextIterator(mi)) != NULL) {
/* let's sanity check this record a bit, otherwise just skip it */
@@ -3421,7 +3562,7 @@ int rpmdbRebuild(const char * prefix)
headerIsEntry(h, RPMTAG_BUILDTIME)))
{
rpmError(RPMERR_INTERNAL,
- _("record number %u in database is bad -- skipping.\n"),
+ _("header #%u in the database is bad -- skipping.\n"),
_RECNUM);
continue;
}
@@ -3455,7 +3596,7 @@ int rpmdbRebuild(const char * prefix)
/* Deleted entries are eliminated in legacy headers by copy. */
{ Header nh = (headerIsEntry(h, RPMTAG_HEADERIMAGE)
? headerCopy(h) : NULL);
- rc = rpmdbAdd(newdb, -1, (nh ? nh : h));
+ rc = rpmdbAdd(newdb, -1, (nh ? nh : h), ts, hdrchk);
nh = headerFree(nh);
}
diff --git a/rpmdb/rpmdb.h b/rpmdb/rpmdb.h
index 9bf0185ea..aabadbba0 100644
--- a/rpmdb/rpmdb.h
+++ b/rpmdb/rpmdb.h
@@ -369,7 +369,7 @@ struct _dbiIndex {
unsigned int dbi_q_extentsize;
/*@refcounted@*/
- rpmdb dbi_rpmdb;
+ rpmdb dbi_rpmdb; /*!< the parent rpm database */
rpmTag dbi_rpmtag; /*!< rpm tag used for index */
int dbi_jlen; /*!< size of join key */
@@ -415,11 +415,14 @@ struct rpmdb_s {
/*@*/;
void (*db_free) (/*@only@*/ void * ptr)
/*@modifies *ptr @*/;
+/*@only@*/ /*@null@*/
+ unsigned char * db_bits; /*!< package instance bit mask. */
+ int db_nbits; /*!< no. of bits in mask. */
int db_opens;
/*@only@*/ /*@null@*/
- void * db_dbenv; /*!< Berkeley DB_ENV handle */
+ void * db_dbenv; /*!< Berkeley DB_ENV handle. */
int db_ndbi; /*!< No. of tag indices. */
- dbiIndex * _dbi; /*!< Tag indices. */
+ dbiIndex * _dbi; /*!< Tag indices. */
/*@refs@*/
int nrefs; /*!< Reference count. */
@@ -719,6 +722,17 @@ int dbiByteSwapped(dbiIndex dbi)
dbi->dbi_byteswapped = (*dbi->dbi_vec->byteswapped) (dbi);
return dbi->dbi_byteswapped;
}
+/** \ingroup dbi
+ * Is database byte swapped?
+ * @param dbi index database handle
+ * @return 0 no
+ */
+/*@unused@*/ static inline
+int dbiStat(dbiIndex dbi, unsigned int flags)
+ /*@modifies dbi @*/
+{
+ return (*dbi->dbi_vec->stat) (dbi, flags);
+}
/*@=globuse =mustmod @*/
/*@=exportlocal@*/
@@ -961,6 +975,17 @@ int rpmdbSetIteratorModified(/*@null@*/ rpmdbMatchIterator mi, int modified)
/*@modifies mi @*/;
/** \ingroup rpmdb
+ * Modify iterator to verify retrieved header blobs.
+ * @param mi rpm database iterator
+ * @param ts transaction set
+ * @param (*hdrchk) headerCheck() vector
+ * @return 0 always
+ */
+int rpmdbSetHdrChk(/*@null@*/ rpmdbMatchIterator mi, /*@null@*/ rpmts ts,
+ /*@null@*/ rpmRC (*hdrchk) (rpmts ts, const void * uh, size_t uc, const char ** msg))
+ /*@modifies mi @*/;
+
+/** \ingroup rpmdb
* Return database iterator.
* @param db rpm database
* @param rpmtag rpm tag
@@ -999,29 +1024,39 @@ rpmdbMatchIterator rpmdbFreeIterator(/*@only@*/ /*@null@*/rpmdbMatchIterator mi)
* @param db rpm database
* @param iid install transaction id (iid = 0 or -1 to skip)
* @param h header
+ * @param ts (unused) transaction set (or NULL)
+ * @param (*hdrchk) (unused) headerCheck() vector (or NULL)
* @return 0 on success
*/
-int rpmdbAdd(/*@null@*/ rpmdb db, int iid, Header h)
+int rpmdbAdd(/*@null@*/ rpmdb db, int iid, Header h, /*@null@*/ rpmts ts,
+ /*@null@*/ rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, const char ** msg))
/*@globals fileSystem @*/
/*@modifies db, h, fileSystem @*/;
/** \ingroup rpmdb
* Remove package header from rpm database and indices.
* @param db rpm database
- * @param rid remove transaction id (rid = 0 or -1 to skip)
+ * @param rid (unused) remove transaction id (rid = 0 or -1 to skip)
* @param hdrNum package instance number in database
+ * @param ts (unused) transaction set (or NULL)
+ * @param (*hdrchk) (unused) headerCheck() vector (or NULL)
* @return 0 on success
*/
-int rpmdbRemove(/*@null@*/ rpmdb db, /*@unused@*/ int rid, unsigned int hdrNum)
+int rpmdbRemove(/*@null@*/ rpmdb db, /*@unused@*/ int rid, unsigned int hdrNum,
+ /*@null@*/ rpmts ts,
+ /*@null@*/ rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, const char ** msg))
/*@globals fileSystem @*/
/*@modifies db, fileSystem @*/;
/** \ingroup rpmdb
* Rebuild database indices from package headers.
* @param prefix path to top of install tree
+ * @param ts transaction set (or NULL)
+ * @param (*hdrchk) headerCheck() vector (or NULL)
* @return 0 on success
*/
-int rpmdbRebuild(/*@null@*/ const char * prefix)
+int rpmdbRebuild(/*@null@*/ const char * prefix, /*@null@*/ rpmts ts,
+ /*@null@*/ rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, const char ** msg))
/*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
/*@modifies rpmGlobalMacroContext, fileSystem, internalState @*/;
diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h
index 1a760b717..de2dd21e7 100644
--- a/rpmio/rpmio_internal.h
+++ b/rpmio/rpmio_internal.h
@@ -68,6 +68,10 @@ struct pgpDig_s {
/*@only@*/ /*@null@*/
DIGEST_CTX md5ctx; /*!< (rsa) md5 hash context. */
+#ifdef NOTYET
+/*@only@*/ /*@null@*/
+ DIGEST_CTX hdrmd5ctx; /*!< (rsa) header md5 hash context. */
+#endif
/*@only@*/ /*@null@*/
void * md5; /*!< (rsa) V3 signature hash. */
size_t md5len; /*!< (rsa) V3 signature hash length. */
diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
index 3fa0195d9..31ab41da2 100644
--- a/rpmio/rpmpgp.c
+++ b/rpmio/rpmpgp.c
@@ -1059,12 +1059,6 @@ pgpDig pgpFreeDig(/*@only@*/ /*@null@*/ pgpDig dig)
pgpCleanDig(dig);
/*@-branchstate@*/
- if (dig->md5ctx != NULL)
- (void) rpmDigestFinal(dig->md5ctx, NULL, NULL, 0);
- /*@=branchstate@*/
- dig->md5ctx = NULL;
-
- /*@-branchstate@*/
if (dig->hdrsha1ctx != NULL)
(void) rpmDigestFinal(dig->hdrsha1ctx, NULL, NULL, 0);
/*@=branchstate@*/
@@ -1084,6 +1078,20 @@ pgpDig pgpFreeDig(/*@only@*/ /*@null@*/ pgpDig dig)
mp32nfree(&dig->r);
mp32nfree(&dig->s);
+#ifdef NOTYET
+ /*@-branchstate@*/
+ if (dig->hdrmd5ctx != NULL)
+ (void) rpmDigestFinal(dig->hdrmd5ctx, NULL, NULL, 0);
+ /*@=branchstate@*/
+ dig->hdrmd5ctx = NULL;
+#endif
+
+ /*@-branchstate@*/
+ if (dig->md5ctx != NULL)
+ (void) rpmDigestFinal(dig->md5ctx, NULL, NULL, 0);
+ /*@=branchstate@*/
+ dig->md5ctx = NULL;
+
mp32bfree(&dig->rsa_pk.n);
mp32nfree(&dig->rsa_pk.e);
mp32nfree(&dig->m);
diff --git a/rpmqv.c b/rpmqv.c
index 6b9cfb35d..bfa078f44 100755
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -946,14 +946,16 @@ int main(int argc, const char ** argv)
switch (bigMode) {
#ifdef IAM_RPMDB
case MODE_INITDB:
- (void) rpmdbInit(rootdir, 0644);
+ (void) rpmtsInitDB(ts, 0644);
break;
case MODE_REBUILDDB:
- ec = rpmdbRebuild(rootdir);
- break;
+ { int vsflags = rpmExpandNumeric("%{_vsflags_rebuilddb}");
+ (void)rpmtsSetVerifySigFlags(ts, (vsflags & ~_RPMTS_VSF_VERIFY_LEGACY));
+ ec = rpmtsRebuildDB(ts);
+ } break;
case MODE_VERIFYDB:
- ec = rpmdbVerify(rootdir);
+ ec = rpmtsVerifyDB(ts);
break;
#endif /* IAM_RPMDB */
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4c2ae75b0..9c62bcf85 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES = -I. \
EXTRA_DIST = rpminject.c rpmsort.c
-EXTRA_PROGRAMS = rpminject rpmsort
+EXTRA_PROGRAMS = rpminject rpmsort tblob
LDADD = \
$(top_builddir)/build/librpmbuild.la \
@@ -42,10 +42,13 @@ rpmcache_SOURCES = rpmcache.c
rpmgraph_SOURCES = rpmgraph.c
#rpmgraph_LDFLAGS = @LDFLAGS_STATIC@
+rpminject_SOURCES = rpminject.c
+rpminject_LDFLAGS = @LDFLAGS_STATIC@
+
rpmsort_SOURCES = rpmsort.c
rpmsort_LDFLAGS = @LDFLAGS_STATIC@
-rpminject_SOURCES = rpminject.c
-rpminject_LDFLAGS = @LDFLAGS_STATIC@
+tblob_SOURCES = tblob.c
+tblob_LDFLAGS = @LDFLAGS_STATIC@
$(PROGRAMS): $(LDADD)
diff --git a/tools/rpmcache.c b/tools/rpmcache.c
index 7f95bfbe0..637ca5591 100644
--- a/tools/rpmcache.c
+++ b/tools/rpmcache.c
@@ -153,7 +153,7 @@ static int ftsCacheUpdate(rpmts ts)
if (rc != 1) break;
/* --- Add new cache header to database. */
- rc = rpmdbAdd(rpmtsGetRdb(ts), tid, ip->h);
+ rc = rpmdbAdd(rpmtsGetRdb(ts), tid, ip->h, NULL, NULL);
if (rc) break;
}