diff options
author | jbj <devnull@localhost> | 2002-08-06 01:41:44 +0000 |
---|---|---|
committer | jbj <devnull@localhost> | 2002-08-06 01:41:44 +0000 |
commit | 035cf961d56c884708902652175070de31e45a57 (patch) | |
tree | ec96dd1cb0965680636c0fe38b0d580537bb0a1a | |
parent | 5211039a20762b4a50c006ccf79666bff34967c2 (diff) | |
download | librpm-tizen-035cf961d56c884708902652175070de31e45a57.tar.gz librpm-tizen-035cf961d56c884708902652175070de31e45a57.tar.bz2 librpm-tizen-035cf961d56c884708902652175070de31e45a57.zip |
- add bitmask for precise control of signature/digest verification.
CVS patchset: 5604
CVS date: 2002/08/06 01:41:44
-rw-r--r-- | CHANGES | 1 | ||||
-rw-r--r-- | build.c | 12 | ||||
-rw-r--r-- | lib/package.c | 68 | ||||
-rw-r--r-- | lib/psm.c | 2 | ||||
-rw-r--r-- | lib/query.c | 13 | ||||
-rw-r--r-- | lib/rpminstall.c | 34 | ||||
-rw-r--r-- | lib/rpmts.c | 20 | ||||
-rw-r--r-- | lib/rpmts.h | 53 | ||||
-rw-r--r-- | lib/transaction.c | 4 | ||||
-rw-r--r-- | lib/verify.c | 14 | ||||
-rw-r--r-- | macros.in | 18 | ||||
-rw-r--r-- | po/cs.po | 66 | ||||
-rw-r--r-- | po/da.po | 66 | ||||
-rw-r--r-- | po/de.po | 66 | ||||
-rw-r--r-- | po/en_RN.po | 66 | ||||
-rw-r--r-- | po/es.po | 66 | ||||
-rw-r--r-- | po/eu_ES.po | 66 | ||||
-rw-r--r-- | po/fi.po | 66 | ||||
-rw-r--r-- | po/fr.po | 66 | ||||
-rw-r--r-- | po/gl.po | 66 | ||||
-rw-r--r-- | po/hu.po | 66 | ||||
-rw-r--r-- | po/id.po | 66 | ||||
-rw-r--r-- | po/is.po | 66 | ||||
-rw-r--r-- | po/it.po | 66 | ||||
-rw-r--r-- | po/ja.po | 66 | ||||
-rw-r--r-- | po/ko.po | 66 | ||||
-rw-r--r-- | po/no.po | 66 | ||||
-rw-r--r-- | po/pl.po | 66 | ||||
-rw-r--r-- | po/pt.po | 66 | ||||
-rw-r--r-- | po/pt_BR.po | 66 | ||||
-rw-r--r-- | po/ro.po | 66 | ||||
-rw-r--r-- | po/rpm.pot | 66 | ||||
-rw-r--r-- | po/ru.po | 66 | ||||
-rw-r--r-- | po/sk.po | 66 | ||||
-rw-r--r-- | po/sl.po | 68 | ||||
-rw-r--r-- | po/sr.po | 66 | ||||
-rw-r--r-- | po/sv.po | 66 | ||||
-rw-r--r-- | po/tr.po | 66 | ||||
-rw-r--r-- | po/uk.po | 66 | ||||
-rw-r--r-- | po/wa.po | 66 | ||||
-rw-r--r-- | po/zh.po | 66 | ||||
-rw-r--r-- | po/zh_CN.GB2312.po | 66 | ||||
-rw-r--r-- | python/rpmmodule.c | 16 | ||||
-rw-r--r-- | python/rpmts-py.c | 48 | ||||
-rw-r--r-- | rpm.spec.in | 3 | ||||
-rw-r--r-- | rpm2cpio.c | 10 | ||||
-rwxr-xr-x | rpmqv.c | 5 | ||||
-rw-r--r-- | tools/rpmcache.c | 12 | ||||
-rw-r--r-- | tools/rpmgraph.c | 24 |
49 files changed, 1231 insertions, 1174 deletions
@@ -224,6 +224,7 @@ - python: the death of rpm.headerFromPackage(), use ts.hdrFromFdno(). - python: permit direct ts.dbMatch() python iterations. - python: the death of rpm.checksig(), use ts.hdrFromFdno() instead. + - add bitmask for precise control of signature/digest verification. 4.0.3 -> 4.0.4: - solaris: translate i86pc to i386 (#57182). @@ -298,16 +298,16 @@ int build(rpmts ts, const char * arg, BTA_t ba, const char * rcfile) char * targets = ba->targets; #define buildCleanMask (RPMBUILD_RMSOURCE|RPMBUILD_RMSPEC) int cleanFlags = ba->buildAmount & buildCleanMask; - int vsflags, ovsflags; + rpmVSFlags vsflags, ovsflags; vsflags = rpmExpandNumeric("%{_vsflags_build}"); if (ba->qva_flags & VERIFY_DIGEST) - vsflags |= _RPMTS_VSF_NODIGESTS; + vsflags |= _RPMVSF_NODIGESTS; if (ba->qva_flags & VERIFY_SIGNATURE) - vsflags |= _RPMTS_VSF_NOSIGNATURES; + vsflags |= _RPMVSF_NOSIGNATURES; if (ba->qva_flags & VERIFY_HDRCHK) - vsflags |= _RPMTS_VSF_NOHDRCHK; - ovsflags = rpmtsSetVerifySigFlags(ts, vsflags); + vsflags |= RPMVSF_NOHDRCHK; + ovsflags = rpmtsSetVSFlags(ts, vsflags); if (targets == NULL) { rc = buildForTarget(ts, arg, ba); @@ -342,7 +342,7 @@ int build(rpmts ts, const char * arg, BTA_t ba, const char * rcfile) } exit: - vsflags = rpmtsSetVerifySigFlags(ts, ovsflags); + vsflags = rpmtsSetVSFlags(ts, ovsflags); /* Restore original configuration. */ rpmFreeMacros(NULL); (void) rpmReadConfigFiles(rcfile, NULL); diff --git a/lib/package.c b/lib/package.c index 0dd037d32..8bbecfb50 100644 --- a/lib/package.c +++ b/lib/package.c @@ -308,7 +308,7 @@ rpmRC headerCheck(rpmts ts, const void * uh, size_t uc, const char ** msg) entryInfo info = memset(alloca(sizeof(*info)), 0, sizeof(*info)); const void * sig = NULL; const char * b; - int vsflags = rpmtsVerifySigFlags(ts); + rpmVSFlags vsflags = rpmtsVSFlags(ts); int siglen = 0; int blen; size_t nb; @@ -367,7 +367,7 @@ rpmRC headerCheck(rpmts ts, const void * uh, size_t uc, const char ** msg) switch (entry->info.tag) { case RPMTAG_SHA1HEADER: - if (vsflags & _RPMTS_VSF_NODIGESTS) + if (vsflags & RPMVSF_NOSHA1HEADER) /*@switchbreak@*/ break; blen = 0; /*@-boundsread@*/ @@ -390,7 +390,7 @@ rpmRC headerCheck(rpmts ts, const void * uh, size_t uc, const char ** msg) case RPMTAG_RSAHEADER: #endif case RPMTAG_DSAHEADER: - if (vsflags & _RPMTS_VSF_NOSIGNATURES) + if (vsflags & RPMVSF_NODSAHEADER) /*@switchbreak@*/ break; if (entry->info.type != RPM_BIN_TYPE) goto exit; @@ -564,7 +564,7 @@ int rpmReadPackageFile(rpmts ts, FD_t fd, int_32 siglen; Header h = NULL; int hmagic; - int vsflags; + rpmVSFlags vsflags; rpmRC rc = RPMRC_FAIL; /* assume failure */ int xx; int i; @@ -614,42 +614,34 @@ int rpmReadPackageFile(rpmts ts, FD_t fd, goto exit; } +#define _chk(_mask) (sigtag == 0 && !(vsflags & (_mask))) + /* Figger the most effective available signature. */ sigtag = 0; - vsflags = rpmtsVerifySigFlags(ts); - if (vsflags & _RPMTS_VSF_VERIFY_LEGACY) { - if (sigtag == 0 && !(vsflags & _RPMTS_VSF_NOSIGNATURES)) { - if (headerIsEntry(sigh, RPMSIGTAG_DSA)) - sigtag = RPMSIGTAG_DSA; - else if (headerIsEntry(sigh, RPMSIGTAG_RSA)) - sigtag = RPMSIGTAG_RSA; - else if (headerIsEntry(sigh, RPMSIGTAG_GPG)) { - sigtag = RPMSIGTAG_GPG; - fdInitDigest(fd, PGPHASHALGO_SHA1, 0); - } else if (headerIsEntry(sigh, RPMSIGTAG_PGP)) { - sigtag = RPMSIGTAG_PGP; - fdInitDigest(fd, PGPHASHALGO_MD5, 0); - } - } - if (sigtag == 0 && !(vsflags & _RPMTS_VSF_NODIGESTS)) { - if (headerIsEntry(sigh, RPMSIGTAG_SHA1)) - sigtag = RPMSIGTAG_SHA1; - else if (headerIsEntry(sigh, RPMSIGTAG_MD5)) { - sigtag = RPMSIGTAG_MD5; - fdInitDigest(fd, PGPHASHALGO_MD5, 0); - } - } - } else { - if (sigtag == 0 && !(vsflags & _RPMTS_VSF_NOSIGNATURES)) { - if (headerIsEntry(sigh, RPMSIGTAG_DSA)) - sigtag = RPMSIGTAG_DSA; - else if (headerIsEntry(sigh, RPMSIGTAG_RSA)) - sigtag = RPMSIGTAG_RSA; - } - if (sigtag == 0 && !(vsflags & _RPMTS_VSF_NODIGESTS)) { - if (headerIsEntry(sigh, RPMSIGTAG_SHA1)) - sigtag = RPMSIGTAG_SHA1; - } + vsflags = rpmtsVSFlags(ts); + if (_chk(RPMVSF_NODSAHEADER) && headerIsEntry(sigh, RPMSIGTAG_DSA)) + sigtag = RPMSIGTAG_DSA; + if (_chk(RPMVSF_NORSAHEADER) && headerIsEntry(sigh, RPMSIGTAG_RSA)) + sigtag = RPMSIGTAG_RSA; + if (_chk(RPMVSF_NODSA|RPMVSF_NEEDPAYLOAD) && + headerIsEntry(sigh, RPMSIGTAG_GPG)) + { + sigtag = RPMSIGTAG_GPG; + fdInitDigest(fd, PGPHASHALGO_SHA1, 0); + } + if (_chk(RPMVSF_NORSA|RPMVSF_NEEDPAYLOAD) && + headerIsEntry(sigh, RPMSIGTAG_PGP)) + { + sigtag = RPMSIGTAG_PGP; + fdInitDigest(fd, PGPHASHALGO_MD5, 0); + } + if (_chk(RPMVSF_NOSHA1HEADER) && headerIsEntry(sigh, RPMSIGTAG_SHA1)) + sigtag = RPMSIGTAG_SHA1; + if (_chk(RPMVSF_NOMD5|RPMVSF_NEEDPAYLOAD) && + headerIsEntry(sigh, RPMSIGTAG_MD5)) + { + sigtag = RPMSIGTAG_MD5; + fdInitDigest(fd, PGPHASHALGO_MD5, 0); } /* Read the metadata, computing digest(s) on the fly. */ @@ -1867,7 +1867,7 @@ assert(psm->mi == NULL); case PSM_RPMDB_ADD: if (rpmtsFlags(ts) & RPMTRANS_FLAG_TEST) break; if (fi->h == NULL) break; /* XXX can't happen */ - if (!(rpmtsVerifySigFlags(ts) & _RPMTS_VSF_NOHDRCHK)) + if (!(rpmtsVSFlags(ts) & RPMVSF_NOHDRCHK)) rc = rpmdbAdd(rpmtsGetRdb(ts), rpmtsGetTid(ts), fi->h, ts, headerCheck); else diff --git a/lib/query.c b/lib/query.c index be8f9b9d1..086b8dab7 100644 --- a/lib/query.c +++ b/lib/query.c @@ -920,7 +920,7 @@ restart: int rpmcliQuery(rpmts ts, QVA_t qva, const char ** argv) { const char * arg; - int vsflags, ovsflags; + rpmVSFlags vsflags, ovsflags; int ec = 0; if (qva->qva_showPackage == NULL) @@ -928,14 +928,13 @@ int rpmcliQuery(rpmts ts, QVA_t qva, const char ** argv) vsflags = rpmExpandNumeric("%{?_vsflags_query}"); if (qva->qva_flags & VERIFY_DIGEST) - vsflags |= _RPMTS_VSF_NODIGESTS; + vsflags |= _RPMVSF_NODIGESTS; if (qva->qva_flags & VERIFY_SIGNATURE) - vsflags |= _RPMTS_VSF_NOSIGNATURES; + vsflags |= _RPMVSF_NOSIGNATURES; if (qva->qva_flags & VERIFY_HDRCHK) - vsflags |= _RPMTS_VSF_NOHDRCHK; - vsflags |= _RPMTS_VSF_VERIFY_LEGACY; + vsflags |= RPMVSF_NOHDRCHK; - ovsflags = rpmtsSetVerifySigFlags(ts, vsflags); + ovsflags = rpmtsSetVSFlags(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); @@ -949,7 +948,7 @@ int rpmcliQuery(rpmts ts, QVA_t qva, const char ** argv) } /*@=boundsread@*/ } - vsflags = rpmtsSetVerifySigFlags(ts, ovsflags); + vsflags = rpmtsSetVSFlags(ts, ovsflags); if (qva->qva_showPackage == showQueryPackage) qva->qva_showPackage = NULL; diff --git a/lib/rpminstall.c b/lib/rpminstall.c index 8110889aa..9dc7fc5d8 100644 --- a/lib/rpminstall.c +++ b/lib/rpminstall.c @@ -282,7 +282,7 @@ int rpmInstall(rpmts ts, /*@only@*/ /*@null@*/ const char * fileURL = NULL; int stopInstall = 0; const char ** av = NULL; - int vsflags, ovsflags; + rpmVSFlags vsflags, ovsflags, tvsflags; int ac = 0; int rc; int xx; @@ -301,13 +301,12 @@ int rpmInstall(rpmts ts, else vsflags = rpmExpandNumeric("%{?_vsflags_install}"); if (ia->qva_flags & VERIFY_DIGEST) - vsflags |= _RPMTS_VSF_NODIGESTS; + vsflags |= _RPMVSF_NODIGESTS; if (ia->qva_flags & VERIFY_SIGNATURE) - vsflags |= _RPMTS_VSF_NOSIGNATURES; + vsflags |= _RPMVSF_NOSIGNATURES; if (ia->qva_flags & VERIFY_HDRCHK) - vsflags |= _RPMTS_VSF_NOHDRCHK; - vsflags |= _RPMTS_VSF_VERIFY_LEGACY; - ovsflags = rpmtsSetVerifySigFlags(ts, (vsflags & ~_RPMTS_VSF_VERIFY_LEGACY)); + vsflags |= RPMVSF_NOHDRCHK; + ovsflags = rpmtsSetVSFlags(ts, vsflags); { int notifyFlags; notifyFlags = ia->installInterfaceFlags | (rpmIsVerbose() ? INSTALL_LABEL : 0 ); @@ -429,9 +428,9 @@ restart: } /* Read the header, verifying signatures (if present). */ - xx = rpmtsSetVerifySigFlags(ts, vsflags); + tvsflags = rpmtsSetVSFlags(ts, vsflags); eiu->rpmrc = rpmReadPackageFile(ts, eiu->fd, *eiu->fnp, &eiu->h); - xx = rpmtsSetVerifySigFlags(ts, xx); + tvsflags = rpmtsSetVSFlags(ts, tvsflags); eiu->isSource = headerIsEntry(eiu->h, RPMTAG_SOURCEPACKAGE); @@ -703,13 +702,12 @@ int rpmErase(rpmts ts, vsflags = rpmExpandNumeric("%{?_vsflags_erase}"); if (ia->qva_flags & VERIFY_DIGEST) - vsflags |= _RPMTS_VSF_NODIGESTS; + vsflags |= _RPMVSF_NODIGESTS; if (ia->qva_flags & VERIFY_SIGNATURE) - vsflags |= _RPMTS_VSF_NOSIGNATURES; + vsflags |= _RPMVSF_NOSIGNATURES; if (ia->qva_flags & VERIFY_HDRCHK) - vsflags |= _RPMTS_VSF_NOHDRCHK; - vsflags |= _RPMTS_VSF_VERIFY_LEGACY; - ovsflags = rpmtsSetVerifySigFlags(ts, (vsflags & ~_RPMTS_VSF_VERIFY_LEGACY)); + vsflags |= RPMVSF_NOHDRCHK; + ovsflags = rpmtsSetVSFlags(ts, vsflags); (void) rpmtsSetFlags(ts, ia->transFlags); @@ -1025,13 +1023,13 @@ int rpmRollback(rpmts ts, vsflags = rpmExpandNumeric("%{?_vsflags_erase}"); if (ia->qva_flags & VERIFY_DIGEST) - vsflags |= _RPMTS_VSF_NODIGESTS; + vsflags |= _RPMVSF_NODIGESTS; if (ia->qva_flags & VERIFY_SIGNATURE) - vsflags |= _RPMTS_VSF_NOSIGNATURES; + vsflags |= _RPMVSF_NOSIGNATURES; if (ia->qva_flags & VERIFY_HDRCHK) - vsflags |= _RPMTS_VSF_NOHDRCHK; - vsflags |= _RPMTS_VSF_VERIFY_LEGACY; - ovsflags = rpmtsSetVerifySigFlags(ts, (vsflags & ~_RPMTS_VSF_VERIFY_LEGACY)); + vsflags |= RPMVSF_NOHDRCHK; + vsflags |= RPMVSF_NEEDPAYLOAD; /* XXX no legacy signatures */ + ovsflags = rpmtsSetVSFlags(ts, vsflags); (void) rpmtsSetFlags(ts, ia->transFlags); diff --git a/lib/rpmts.c b/lib/rpmts.c index 33fb49e60..f8cf0ec3a 100644 --- a/lib/rpmts.c +++ b/lib/rpmts.c @@ -146,7 +146,7 @@ int rpmtsInitDB(rpmts ts, int dbmode) int rpmtsRebuildDB(rpmts ts) { int rc; - if (!(ts->vsflags & _RPMTS_VSF_NOHDRCHK)) + if (!(ts->vsflags & RPMVSF_NOHDRCHK)) rc = rpmdbRebuild(ts->rootDir, ts, headerCheck); else rc = rpmdbRebuild(ts->rootDir, NULL, NULL); @@ -165,7 +165,7 @@ rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag, if (ts->rdb == NULL && rpmtsOpenDB(ts, ts->dbmode)) return NULL; mi = rpmdbInitIterator(ts->rdb, rpmtag, keyp, keylen); - if (mi && !(ts->vsflags & _RPMTS_VSF_NOHDRCHK)) + if (mi && !(ts->vsflags & RPMVSF_NOHDRCHK)) (void) rpmdbSetHdrChk(mi, ts, headerCheck); return mi; } @@ -557,22 +557,22 @@ rpmts rpmtsFree(rpmts ts) return NULL; } -int rpmtsVerifySigFlags(rpmts ts) +rpmVSFlags rpmtsVSFlags(rpmts ts) { - int ret = 0; + rpmVSFlags vsflags = 0; if (ts != NULL) - ret = ts->vsflags; - return ret; + vsflags = ts->vsflags; + return vsflags; } -int rpmtsSetVerifySigFlags(rpmts ts, int vsflags) +rpmVSFlags rpmtsSetVSFlags(rpmts ts, rpmVSFlags vsflags) { - int ret = 0; + rpmVSFlags ovsflags = 0; if (ts != NULL) { - ret = ts->vsflags; + ovsflags = ts->vsflags; ts->vsflags = vsflags; } - return ret; + return ovsflags; } const char * rpmtsRootDir(rpmts ts) diff --git a/lib/rpmts.h b/lib/rpmts.h index 294fa42ec..511eecbe8 100644 --- a/lib/rpmts.h +++ b/lib/rpmts.h @@ -15,10 +15,49 @@ extern int _rpmts_debug; extern int _fps_debug; /*@=exportlocal@*/ -#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) +/** + * Bit(s) to control digest and signature verification. + */ +typedef enum rpmVSFlags_e { + RPMVSF_DEFAULT = 0, + RPMVSF_NOHDRCHK = (1 << 0), + RPMVSF_NEEDPAYLOAD = (1 << 1), + /* bit(s) 2-7 unused */ + RPMVSF_NOSHA1HEADER = (1 << 8), + RPMVSF_NOMD5HEADER = (1 << 9), /* unimplemented */ + RPMVSF_NODSAHEADER = (1 << 10), + RPMVSF_NORSAHEADER = (1 << 11), /* unimplemented */ + /* bit(s) 12-15 unused */ + RPMVSF_NOSHA1 = (1 << 16), /* unimplemented */ + RPMVSF_NOMD5 = (1 << 17), + RPMVSF_NODSA = (1 << 18), + RPMVSF_NORSA = (1 << 19) + /* bit(s) 16-31 unused */ +} rpmVSFlags; + +#define _RPMVSF_NODIGESTS \ + ( RPMVSF_NOSHA1HEADER | \ + RPMVSF_NOMD5HEADER | \ + RPMVSF_NOSHA1 | \ + RPMVSF_NOMD5 ) + +#define _RPMVSF_NOSIGNATURES \ + ( RPMVSF_NODSAHEADER | \ + RPMVSF_NORSAHEADER | \ + RPMVSF_NODSA | \ + RPMVSF_NORSA ) + +#define _RPMVSF_NOHEADER \ + ( RPMVSF_NOSHA1HEADER | \ + RPMVSF_NOMD5HEADER | \ + RPMVSF_NODSAHEADER | \ + RPMVSF_NORSAHEADER ) + +#define _RPMVSF_NOPAYLOAD \ + ( RPMVSF_NOSHA1 | \ + RPMVSF_NOMD5 | \ + RPMVSF_NODSA | \ + RPMVSF_NORSA ) #if defined(_RPMTS_INTERNAL) @@ -131,7 +170,7 @@ struct rpmts_s { int delta; /*!< Delta for reallocation. */ int_32 tid; /*!< Transaction id. */ - int vsflags; /*!< Signature/digest verification flags. */ + rpmVSFlags vsflags; /*!< Signature/digest verification flags. */ /*@observer@*/ /*@dependent@*/ /*@null@*/ const char * fn; /*!< Current package fn. */ @@ -392,7 +431,7 @@ rpmts rpmtsFree(/*@killref@*/ /*@only@*//*@null@*/ rpmts ts) * @param ts transaction set * @return verify signatures flags */ -int rpmtsVerifySigFlags(rpmts ts) +rpmVSFlags rpmtsVSFlags(rpmts ts) /*@*/; /** \ingroup rpmts @@ -401,7 +440,7 @@ int rpmtsVerifySigFlags(rpmts ts) * @param vsflags new verify signatures flags * @return previous value */ -int rpmtsSetVerifySigFlags(rpmts ts, int vsflags) +rpmVSFlags rpmtsSetVSFlags(rpmts ts, rpmVSFlags vsflags) /*@modifies ts @*/; /** \ingroup rpmts diff --git a/lib/transaction.c b/lib/transaction.c index c84229ddc..8d16eba14 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -1414,10 +1414,14 @@ rpmMessage(RPMMESS_DEBUG, _("install/erase %d elements\n"), rpmtsNElements(ts)); rpmteKey(p), ts->notifyData); /*@=noeffectuncon@*/ if (rpmteFd(p) != NULL) { + rpmVSFlags ovsflags = rpmtsVSFlags(ts); + rpmVSFlags vsflags = ovsflags | RPMVSF_NEEDPAYLOAD; rpmRC rpmrc; + ovsflags = rpmtsSetVSFlags(ts, vsflags); rpmrc = rpmReadPackageFile(ts, rpmteFd(p), rpmteNEVR(p), &p->h); + vsflags = rpmtsSetVSFlags(ts, ovsflags); if (!(rpmrc == RPMRC_OK || rpmrc == RPMRC_BADSIZE)) { /*@-noeffectuncon@*/ /* FIX: notify annotations */ diff --git a/lib/verify.c b/lib/verify.c index 9e50da4e4..a58612564 100644 --- a/lib/verify.c +++ b/lib/verify.c @@ -467,7 +467,7 @@ int showVerifyPackage(QVA_t qva, rpmts ts, Header h) int rpmcliVerify(rpmts ts, QVA_t qva, const char ** argv) { const char * arg; - int vsflags, ovsflags; + rpmVSFlags vsflags, ovsflags; int ec = 0; if (qva->qva_showPackage == NULL) @@ -476,14 +476,14 @@ int rpmcliVerify(rpmts ts, QVA_t qva, const char ** argv) /* XXX verify flags are inverted from query. */ vsflags = rpmExpandNumeric("%{?_vsflags_verify}"); if (!(qva->qva_flags & VERIFY_DIGEST)) - vsflags |= _RPMTS_VSF_NODIGESTS; + vsflags |= _RPMVSF_NODIGESTS; if (!(qva->qva_flags & VERIFY_SIGNATURE)) - vsflags |= _RPMTS_VSF_NOSIGNATURES; + vsflags |= _RPMVSF_NOSIGNATURES; if (!(qva->qva_flags & VERIFY_HDRCHK)) - vsflags |= _RPMTS_VSF_NOHDRCHK; - vsflags |= _RPMTS_VSF_VERIFY_LEGACY; + vsflags |= RPMVSF_NOHDRCHK; + vsflags &= ~RPMVSF_NEEDPAYLOAD; - ovsflags = rpmtsSetVerifySigFlags(ts, vsflags); + ovsflags = rpmtsSetVSFlags(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); @@ -497,7 +497,7 @@ int rpmcliVerify(rpmts ts, QVA_t qva, const char ** argv) } /*@=boundsread@*/ } - vsflags = rpmtsSetVerifySigFlags(ts, ovsflags); + vsflags = rpmtsSetVSFlags(ts, ovsflags); if (qva->qva_showPackage == showVerifyPackage) qva->qva_showPackage = NULL; @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: /usr/lib/rpm/macros # \verbatim # -# $Id: macros.in,v 1.117 2002/08/02 21:52:01 jbj Exp $ +# $Id: macros.in,v 1.118 2002/08/06 01:41:46 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 @@ -555,17 +555,11 @@ %_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 +# 1 --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. +# The checking overhead is ~11ms per header for digests/signatures; +# each header from the database is checked only when first encountered +# for each database open. # # Note: the %_vsflags_erase applies to --upgrade/--freshen modes as # well as --erase. @@ -573,7 +567,7 @@ %_vsflags_build 0 %_vsflags_erase 0 %_vsflags_install 0 -%_vsflags_query 8 +%_vsflags_query 1 %_vsflags_rebuilddb 0 %_vsflags_up2date 0 %_vsflags_verify 0 @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -310,36 +310,36 @@ 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:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "ke znovusestavení nezadány žádné balíčky" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "pro sestavení nezadány žádné spec soubory" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "pro sestavení nezadány žádné tar soubory" -#: rpmqv.c:736 +#: rpmqv.c:737 #, fuzzy msgid "no packages given for erase" msgstr "nezadány žádné balíčky pro instalaci" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "nezadány žádné balíčky pro instalaci" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "k dotazu nezadány žádné parametry" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "pro kontrolu nezadány žádné balíčky" -#: rpmqv.c:822 +#: rpmqv.c:823 #, fuzzy msgid "no arguments given" msgstr "k dotazu nezadány žádné parametry" @@ -1555,8 +1555,8 @@ 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:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1580,12 +1580,12 @@ msgstr "%s: readLead selhalo\n" msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead selhalo\n" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread selhalo: %s\n" @@ -2229,8 +2229,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:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "otevření %s selhalo: %s\n" @@ -2244,7 +2244,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:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "žádný balíček neaktivuje %s\n" @@ -2313,7 +2313,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:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "balíček %s není nainstalován\n" @@ -2511,84 +2511,84 @@ msgstr "" msgid "Upgrading packages..." msgstr "aktualizace balíčku" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, 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:381 +#: lib/rpminstall.c:380 #, fuzzy, c-format msgid " ... as %s\n" msgstr "%s uloženo jako %s\n" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "cesta %s v balíčku %s není přemístitelná" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, 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:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "neinstalován " -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, 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:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "chybné závislosti při sestavování:\n" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 #, fuzzy msgid "installing binary packages\n" msgstr "nainstalovat balíček" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nemohu vytvořit %s: %s\n" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, 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:795 +#: lib/rpminstall.c:793 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nemohu vytvořit %s: %s\n" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, fuzzy, c-format msgid "Installing %s\n" msgstr "řádek: %s\n" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -305,36 +305,36 @@ msgstr "--sign kan kun bruges ved pakkeopbygning" msgid "exec failed\n" msgstr "eksekvering mislykkedes\n" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "ingen pakkefiler angivet til genopbygning" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "ingen spec-fil angivet til opbygning" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "ingen tar-arkiver angivet til opbygning" -#: rpmqv.c:736 +#: rpmqv.c:737 #, fuzzy msgid "no packages given for erase" msgstr "ingen pakker angivet ved installation" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "ingen pakker angivet ved installation" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "ingen parametre angivet ved forespřrgsel" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "ingen parametre angivet ved verifikation" -#: rpmqv.c:822 +#: rpmqv.c:823 #, fuzzy msgid "no arguments given" msgstr "ingen parametre angivet ved forespřrgsel" @@ -1553,8 +1553,8 @@ 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:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1579,12 +1579,12 @@ msgstr "%s: rpmReadSignature mislykkedes\n" msgid "%s: No signature available\n" msgstr "%s: Ingen tilgćngelig signatur\n" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead mislykkedes\n" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread mislykkedes: %s\n" @@ -2244,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:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "ĺbning af %s mislykkedes %s\n" @@ -2259,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:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "ingen pakker udlřser %s\n" @@ -2328,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:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "pakken %s er ikke installeret\n" @@ -2526,83 +2526,83 @@ msgstr "Forbereder..." msgid "Upgrading packages..." msgstr "opgradér pakke" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, c-format msgid "Retrieving %s\n" msgstr "Modtager %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr " ... som %s\n" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "overspringer %s - overfřrsel mislykkedes - %s\n" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, c-format msgid "package %s is not relocateable\n" msgstr "pakke %s kan ikke omrokeres\n" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "fejl ved lćsning fra filen %s\n" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, 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:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s kunne ikke installeres\n" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "fandt %d kilde- og %d binćrpakker\n" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "afhćngighedskrav, der ikke kunne imřdekommes:\n" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "installerer binćrpakker\n" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open file %s: %s\n" msgstr "kunne ikke ĺbne fil %s: %s\n" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" angiver flere pakker\n" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, c-format msgid "cannot open %s: %s\n" msgstr "kunne ikke ĺbne %s: %s\n" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -367,36 +367,36 @@ msgstr "--sign darf nur während der Paketerstellung benutzt werden" msgid "exec failed\n" msgstr "%s: Öffnen fehlgeschlagen\n" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "Es wurden keine Paketdateien für die Neuerstellung angegeben" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "Es wurde kein spec-Datei für die Erstellung angegeben" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "Es wurde keine tar-Datei für die Erstellung angegeben" -#: rpmqv.c:736 +#: rpmqv.c:737 #, fuzzy msgid "no packages given for erase" msgstr "Es wurden keine Pakete für die Installation angegeben" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "Es wurden keine Pakete für die Installation angegeben" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "Es wurden keine Argumente für die Anfrage angegeben" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "Es wurden keine Argumente für die Überprüfung angegeben" -#: rpmqv.c:822 +#: rpmqv.c:823 #, fuzzy msgid "no arguments given" msgstr "Es wurden keine Argumente für die Anfrage angegeben" @@ -1688,8 +1688,8 @@ msgstr "kann Datei %s nicht öffnen: " msgid "error creating temporary file %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/package.c:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1717,12 +1717,12 @@ msgstr "%s: ťrpmReadSignatureŤ fehlgeschlagen\n" msgid "%s: No signature available\n" msgstr "%s: Keine Signatur verfügbar\n" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: ťreadLeadŤ fehlgeschlagen\n" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: ťreadLeadŤ fehlgeschlagen\n" @@ -2406,8 +2406,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:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 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" @@ -2421,7 +2421,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:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "kein Paket triggert %s\n" @@ -2494,7 +2494,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:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "Paket %s ist nicht installiert\n" @@ -2694,84 +2694,84 @@ msgid "Upgrading packages..." msgstr "Paket installieren" # , c-format -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, 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:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "Paket %s ist nicht installiert\n" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "Fehler: %s kann nicht installiert werden\n" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 #, fuzzy msgid "installing binary packages\n" msgstr "Paket installieren" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" bezeichnet mehrere Pakete\n" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "Installiere %s\n" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" diff --git a/po/en_RN.po b/po/en_RN.po index 7c16f7962..a60abfc77 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-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -300,35 +300,35 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:736 +#: rpmqv.c:737 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:822 +#: rpmqv.c:823 msgid "no arguments given" msgstr "" @@ -1515,8 +1515,8 @@ msgstr "" msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1540,12 +1540,12 @@ msgstr "" msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" @@ -2160,8 +2160,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2175,7 +2175,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "" @@ -2244,7 +2244,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2434,82 +2434,82 @@ msgstr "" msgid "Upgrading packages..." msgstr "" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -300,35 +300,35 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:736 +#: rpmqv.c:737 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:822 +#: rpmqv.c:823 msgid "no arguments given" msgstr "" @@ -1515,8 +1515,8 @@ msgstr "" msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1540,12 +1540,12 @@ msgstr "" msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" @@ -2160,8 +2160,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2175,7 +2175,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "" @@ -2244,7 +2244,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2434,82 +2434,82 @@ msgstr "" msgid "Upgrading packages..." msgstr "" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" diff --git a/po/eu_ES.po b/po/eu_ES.po index 7c16f7962..a60abfc77 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-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -300,35 +300,35 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:736 +#: rpmqv.c:737 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:822 +#: rpmqv.c:823 msgid "no arguments given" msgstr "" @@ -1515,8 +1515,8 @@ msgstr "" msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1540,12 +1540,12 @@ msgstr "" msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" @@ -2160,8 +2160,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2175,7 +2175,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "" @@ -2244,7 +2244,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2434,82 +2434,82 @@ msgstr "" msgid "Upgrading packages..." msgstr "" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-0400\n" "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n" "Language-Team: Finnish <linux@sot.com>\n" "Content-Type: text/plain; charset=\n" @@ -315,36 +315,36 @@ msgstr "--sign: voidaan käyttää vain paketteja käännettäessä" msgid "exec failed\n" msgstr "%s: avaus ei onnistunut\n" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "uudelleenkäännolle ei määritelty paketteja" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "käännökselle ei annettu määrittelytiedostoja" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "käännökselle ei määritelty tar-tiedostoja" -#: rpmqv.c:736 +#: rpmqv.c:737 #, fuzzy msgid "no packages given for erase" msgstr "asennukselle ei määritelty paketteja" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "asennukselle ei määritelty paketteja" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "kyselylle ei annettu parametrejä" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "tarkistukselle ei annettu parametrejä" -#: rpmqv.c:822 +#: rpmqv.c:823 #, fuzzy msgid "no arguments given" msgstr "kyselylle ei annettu parametrejä" @@ -1573,8 +1573,8 @@ msgstr "en voinut avata tiedostoa %s: " msgid "error creating temporary file %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/package.c:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1602,12 +1602,12 @@ msgstr "%s: rpmReadSignature epäonnistui\n" msgid "%s: No signature available\n" msgstr "%s: Ei allekirjoitusta saatavilla\n" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead epäonnistui\n" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: readLead epäonnistui\n" @@ -2284,8 +2284,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:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 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" @@ -2299,7 +2299,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:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "mikään paketti ei laukaise %s:a\n" @@ -2369,7 +2369,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:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "paketti %s ei ole asennettu\n" @@ -2564,84 +2564,84 @@ msgstr "" msgid "Upgrading packages..." msgstr "asenna paketti" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, c-format msgid "Retrieving %s\n" msgstr "Haen: %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "virhe: %s ei voida asentaa\n" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "puuttuvat riippuvuudet:\n" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 #, fuzzy msgid "installing binary packages\n" msgstr "asenna paketti" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" määrittää useita paketteja\n" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "virhe: en voi avata %s\n" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "Asennan: %s\n" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -343,37 +343,37 @@ 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:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "aucun package n'a t spcifi pour la reconstruction" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "aucun package n'a t spcifi pour la construction" -#: rpmqv.c:714 +#: rpmqv.c:715 #, fuzzy msgid "no tar files given for build" msgstr "aucun package n'a t spcifi pour la construction" -#: rpmqv.c:736 +#: rpmqv.c:737 #, fuzzy msgid "no packages given for erase" msgstr "aucun package n'a t spcifi pour l'installation" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "aucun package n'a t spcifi pour l'installation" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "aucun argument n'a t fourni pour la requte" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "aucun argument n'a t fourni pour la vrification" -#: rpmqv.c:822 +#: rpmqv.c:823 #, fuzzy msgid "no arguments given" msgstr "aucun argument n'a t fourni pour la requte" @@ -1600,8 +1600,8 @@ msgstr "impossible d'ouvrir: %s\n" msgid "error creating temporary file %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/package.c:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1625,12 +1625,12 @@ msgstr "" msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -2326,8 +2326,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:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "La construction a chou.\n" @@ -2341,7 +2341,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -2411,7 +2411,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -2606,83 +2606,83 @@ msgid "Upgrading packages..." msgstr "" " -p <packagefile>+ - interroge le package (non install) <packagefile>" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 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:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -295,35 +295,35 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:736 +#: rpmqv.c:737 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:822 +#: rpmqv.c:823 msgid "no arguments given" msgstr "" @@ -1510,8 +1510,8 @@ msgstr "" msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1535,12 +1535,12 @@ msgstr "" msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" @@ -2155,8 +2155,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2170,7 +2170,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "" @@ -2239,7 +2239,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2429,82 +2429,82 @@ msgstr "" msgid "Upgrading packages..." msgstr "" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -300,35 +300,35 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:736 +#: rpmqv.c:737 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:822 +#: rpmqv.c:823 msgid "no arguments given" msgstr "" @@ -1515,8 +1515,8 @@ msgstr "" msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1540,12 +1540,12 @@ msgstr "" msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" @@ -2160,8 +2160,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2175,7 +2175,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "" @@ -2244,7 +2244,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2434,82 +2434,82 @@ msgstr "" msgid "Upgrading packages..." msgstr "" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -300,35 +300,35 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:736 +#: rpmqv.c:737 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:822 +#: rpmqv.c:823 msgid "no arguments given" msgstr "" @@ -1515,8 +1515,8 @@ msgstr "" msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1540,12 +1540,12 @@ msgstr "" msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" @@ -2160,8 +2160,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2175,7 +2175,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "" @@ -2244,7 +2244,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2434,82 +2434,82 @@ msgstr "" msgid "Upgrading packages..." msgstr "" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -298,35 +298,35 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:736 +#: rpmqv.c:737 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:822 +#: rpmqv.c:823 msgid "no arguments given" msgstr "" @@ -1523,8 +1523,8 @@ msgstr "get ekki ritađ í %%%s %s\n" msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1548,12 +1548,12 @@ msgstr "" msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: Fseek brást: %s\n" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" @@ -2181,8 +2181,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2196,7 +2196,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "get ekki opnađ pakka gagnagrunn í\n" @@ -2265,7 +2265,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2456,83 +2456,83 @@ msgstr "" msgid "Upgrading packages..." msgstr "uppfćra pakka" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "gat ekki útbúiđ pakkaskilyrđi:\n" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -300,35 +300,35 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:736 +#: rpmqv.c:737 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:822 +#: rpmqv.c:823 msgid "no arguments given" msgstr "" @@ -1515,8 +1515,8 @@ msgstr "" msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1540,12 +1540,12 @@ msgstr "" msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" @@ -2160,8 +2160,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2175,7 +2175,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "" @@ -2244,7 +2244,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2434,82 +2434,82 @@ msgstr "" msgid "Upgrading packages..." msgstr "" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -325,36 +325,36 @@ msgstr "--sign ¤ĎĽŃĽĂĽąĄźĽ¸şîŔŽťţ¤Î¤ßťČÍѤǤ¤Ţ¤š" msgid "exec failed\n" msgstr "źÂšÔźşÇÔ\n" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "şĆşîŔŽ¤š¤ë¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸ĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "şîŔŽ¤Î¤ż¤á¤Î spec ĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "şîŔŽ(build)¤Î¤ż¤á¤Î tar ĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó" -#: rpmqv.c:736 +#: rpmqv.c:737 #, fuzzy msgid "no packages given for erase" msgstr "Ľ¤ĽóĽšĽČĄźĽë¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "Ľ¤ĽóĽšĽČĄźĽë¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "Ě䤤šç¤ď¤ť¤Î¤ż¤á¤Î°úżô¤Ź¤˘¤ę¤Ţ¤ť¤ó" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "¸ĄžÚ¤Î¤ż¤á¤Î°úżô¤Ź¤˘¤ę¤Ţ¤ť¤ó" -#: rpmqv.c:822 +#: rpmqv.c:823 #, fuzzy msgid "no arguments given" msgstr "Ě䤤šç¤ď¤ť¤Î¤ż¤á¤Î°úżô¤Ź¤˘¤ę¤Ţ¤ť¤ó" @@ -1598,8 +1598,8 @@ msgstr "%s ¤Ř˝ń¤šţ¤á¤Ţ¤ť¤ó" msgid "error creating temporary file %s\n" msgstr "°ěťţĽŐĽĄĽ¤Ľë %s ¤ÎşîŔŽĽ¨ĽéĄź" -#: lib/package.c:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1627,12 +1627,12 @@ msgstr "%s: rpmReadSignature ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n" msgid "%s: No signature available\n" msgstr "%s: ͸ú¤Ę˝đĚž¤Ď¤˘¤ę¤Ţ¤ť¤ó\n" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s\n" @@ -2322,8 +2322,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:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ: %s\n" @@ -2337,7 +2337,7 @@ msgstr "%s ¤Ř¤ÎĚ䤤šç¤ď¤ť¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n" msgid "old format source packages cannot be queried\n" msgstr "ľěˇÁź°¤ÎĽ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤ňĚ䤤šç¤ď¤ť¤ë¤ł¤Č¤Ď¤Ç¤¤Ţ¤ť¤ó\n" -#: lib/query.c:609 lib/rpminstall.c:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "%s ¤ňĽČĽęĽŹĄź¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n" @@ -2407,7 +2407,7 @@ msgstr "ĽŃĽĂĽąĄźĽ¸ĽěĽłĄźĽÉČÖšć %d\n" msgid "record %u could not be read\n" msgstr "ĽěĽłĄźĽÉ %d ¤ňĆɤळ¤Č¤Ź¤Ç¤¤Ţ¤ť¤ó¤Ç¤ˇ¤ż\n" -#: lib/query.c:907 lib/rpminstall.c:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ĎĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó\n" @@ -2606,83 +2606,83 @@ msgstr "" msgid "Upgrading packages..." msgstr "ĽŃĽĂĽąĄźĽ¸ĽŐĽĄĽ¤Ľë¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, c-format msgid "Retrieving %s\n" msgstr "%s ¤ňźčĆŔ¤ˇ¤Ć¤¤¤Ţ¤š\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "%s ¤Č¤ˇ¤Ć...\n" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s ¤ňĽšĽĽĂĽ×¤ˇ¤Ţ¤š - ĹžÁ÷źşÇÔ - %s\n" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ĎşĆÇŰĂ֤Ǥ¤Ţ¤ť¤ó" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "ĽŐĽĄĽ¤Ľë %s ¤Ť¤é¤ÎĆɤߚţ¤ßĽ¨ĽéĄź " -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "ĽŐĽĄĽ¤Ľë %s ¤Ë¤Ď¤č¤ężˇ¤ˇ¤¤ RPM ¤ÎĽĐĄźĽ¸ĽçĽó¤ŹÉŹÍפǤš\n" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "%s ¤ňĽ¤ĽóĽšĽČĄźĽë¤Ç¤¤Ţ¤ť¤ó\n" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "%d ¸Ä¤ÎĽ˝ĄźĽš¤Č %d ¸Ä¤ÎĽĐĽ¤ĽĘĽęĽŃĽĂĽąĄźĽ¸¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ˇ¤ż\n" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "°Í¸Ŕ¤ÎˇçÇĄ:\n" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "ĽĐĽ¤ĽĘĽęĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽëĂć\n" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "ĽŐĽĄĽ¤Ľë %s ¤ňĽŞĄźĽ×Ľó¤Ç¤¤Ţ¤ť¤ó: %s" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¤ĎĘŁżô¤ÎĽŃĽĂĽąĄźĽ¸¤ňťŘÄꤡ¤Ć¤¤¤Ţ¤š\n" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "%s ¤ňĽŞĄźĽ×Ľó¤Ç¤¤Ţ¤ť¤ó\n" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "%s ¤ňĽ¤ĽóĽšĽČĄźĽëĂć\n" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.4\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -305,35 +305,35 @@ msgstr "--sign żÉźÇŔş ĆĐĹ°Áö ÁŚŔ۽ÿĄ¸¸ ťçżëÇŇ źö ŔÖ˝Ŕ´Ď´Ů" msgid "exec failed\n" msgstr "˝ÇÇ࿥ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "ŔçÁŚŔŰ(rebuild)ÇŇ ĆĐĹ°Áö ĆÄŔĎŔĚ ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "ĆĐĹ°Áö ÁŚŔŰżĄ ÇĘżäÇŃ spec ĆÄŔĎŔĚ ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "ĆĐĹ°Áö ÁŚŔŰżĄ ÇĘżäÇŃ tar ĆÄŔĎŔĚ ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů" -#: rpmqv.c:736 +#: rpmqv.c:737 msgid "no packages given for erase" msgstr "ťčÁŚÇŇ ĆĐĹ°Áö°Ą ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "źłÄĄÇŇ ĆĐĹ°Áö°Ą ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "ÁúŔÇżĄ ÇĘżäÇŃ ŔÎźö°Ą ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "°ËÁőżĄ ÇĘżäÇŃ ŔÎźö°Ą ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů" -#: rpmqv.c:822 +#: rpmqv.c:823 #, fuzzy msgid "no arguments given" msgstr "ÁúŔÇżĄ ÇĘżäÇŃ ŔÎźö°Ą ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů" @@ -1539,8 +1539,8 @@ msgstr "%%%s %s(Ŕť)¸Ś ŔŰźşÇŇ źö žř˝Ŕ´Ď´Ů\n" msgid "error creating temporary file %s\n" msgstr "Ŕӽà ĆÄŔĎ %s(Ŕť)¸Ś ťýźşÇĎ´Â ľľÁß żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů\n" -#: lib/package.c:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1564,12 +1564,12 @@ msgstr "%s: rpmReadSignatureŔĚ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n" msgid "%s: No signature available\n" msgstr "%s: ŔŻČżÇŃ ź¸íŔĚ žř˝Ŕ´Ď´Ů\n" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLeadŔĚ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: FreadŔĚ ˝ÇĆĐÇß˝Ŕ´Ď´Ů: %s\n" @@ -2218,8 +2218,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:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "%s(Ŕť)¸Ś żŠ´ÂľĽ ˝ÇĆĐÇÔ: %s\n" @@ -2233,7 +2233,7 @@ msgstr "%s(Ŕť)¸Ś ÁúŔÇÇĎ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n" msgid "old format source packages cannot be queried\n" msgstr "ŔĚŔü Çü˝ÄŔÇ źŇ˝ş ĆĐĹ°Áö´Â ÁúŔÇÇŇ źö žř˝Ŕ´Ď´Ů\n" -#: lib/query.c:609 lib/rpminstall.c:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "%s(żÍ)°ú ŔĎÄĄÇĎ´Â ĆĐĹ°Áö°Ą žřŔ˝: %s\n" @@ -2303,7 +2303,7 @@ msgstr "ĆĐĹ°Áö ąâˇĎ(record) šřČŁ: %u\n" msgid "record %u could not be read\n" msgstr "ąâˇĎ(record) šřČŁ %u(Ŕş)´Â ŔĐŔť źö žř˝Ŕ´Ď´Ů\n" -#: lib/query.c:907 lib/rpminstall.c:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "%s ĆĐĹ°Áö°Ą źłÄĄľÇžî ŔÖÁö žĘ˝Ŕ´Ď´Ů\n" @@ -2500,83 +2500,83 @@ msgstr "ÁŘşń Áß..." msgid "Upgrading packages..." msgstr "ĆĐĹ°Áö¸Ś ž÷ą×ˇšŔĚľĺ ÇŐ´Ď´Ů" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, c-format msgid "Retrieving %s\n" msgstr "%s(Ŕť)¸Ś şšą¸ÇŐ´Ď´Ů\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr " ... %s(Ŕ¸)ˇÎ\n" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s(Ŕť)¸Ś ťýˇŤÇŐ´Ď´Ů - ŔüźŰ(transfer)żĄ ˝ÇĆĐÇÔ - %s\n" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, c-format msgid "package %s is not relocateable\n" msgstr "%s ĆĐĹ°Áö´Â ŔçščÄĄÇŇ źö žř˝Ŕ´Ď´Ů\n" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "%s ĆÄŔĎŔť ŔĐ´Â ľľÁß żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů\n" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "%s ĆÄŔĎŔş ĂֽŠšöŔüŔÇ RPMŔť ÇĘżäˇÎ ÇŐ´Ď´Ů\n" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s(Ŕş)´Â źłÄĄÇŇ źö žř˝Ŕ´Ď´Ů\n" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "%dŔÇ źŇ˝şżÍ %dŔÇ šŮŔ̳ʸŽ ĆĐĹ°Áö°Ą °ËťöľÇžú˝Ŕ´Ď´Ů\n" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "ŔÇÁ¸źş šŽÁŚˇÎ ŔÎÇŘ ˝ÇĆĐÇÔ:\n" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "šŮŔ̳ʸŽ ĆĐĹ°Áö¸Ś źłÄĄÇŐ´Ď´Ů\n" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open file %s: %s\n" msgstr "%s ĆÄŔĎŔť ż źö žřŔ˝: %s\n" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" żŠˇŻ°łŔÇ ĆĐĹ°Áö¸Ś ÁöÁ¤ÇŐ´Ď´Ů\n" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, c-format msgid "cannot open %s: %s\n" msgstr "%s(Ŕť)¸Ś ż źö žřŔ˝: %s\n" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "%s(Ŕť)¸Ś źłÄĄÇŐ´Ď´Ů\n" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -304,36 +304,36 @@ msgstr "" msgid "exec failed\n" msgstr "kjřring feilet\n" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "ingen pakkefiler oppgitt for ombygging" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "ingen spec-fil oppgitt for bygging" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "ingen tar-fil oppgitt for bygging" -#: rpmqv.c:736 +#: rpmqv.c:737 #, fuzzy msgid "no packages given for erase" msgstr "ingen pakker oppgitt for installering" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "ingen pakker oppgitt for installering" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "ingen argumenter oppgitt for spřrring" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "ingen argumenter oppgitt for verifisering" -#: rpmqv.c:822 +#: rpmqv.c:823 #, fuzzy msgid "no arguments given" msgstr "ingen argumenter oppgitt for spřrring" @@ -1538,8 +1538,8 @@ 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:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1563,12 +1563,12 @@ msgstr "%s: rpmReadSignature feilet\n" msgid "%s: No signature available\n" msgstr "%s: Ingen signatur tilgjengelig\n" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead feilet\n" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread feilet: %s\n" @@ -2208,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:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 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" @@ -2223,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:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "ingen pakke utlřser %s\n" @@ -2292,7 +2292,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "pakke %s er ikke installert\n" @@ -2485,83 +2485,83 @@ msgstr "Forbereder..." msgid "Upgrading packages..." msgstr "oppgrader pakke(r)" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, c-format msgid "Retrieving %s\n" msgstr "Henter %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr " ... som %s\n" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "hopper over %s - overfřring feilet - %s\n" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, c-format msgid "package %s is not relocateable\n" msgstr "pakke %s kan ikke relokeres\n" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "feil under lesing fra fil %s\n" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, 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:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "fant %d kilde- og %d binćrpakker\n" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "feilede avhengigheter:\n" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "installerer binćrpakker\n" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" spesifiserer flere pakker\n" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, c-format msgid "cannot open %s: %s\n" msgstr "kan ikke ĺpne %s: %s\n" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -316,36 +316,36 @@ msgstr "--sign można użyć tylko w trakcie budowania pakietu" msgid "exec failed\n" msgstr "wykonanie nie powiodło się\n" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "nie podano nazw pakietów do przebudowania" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "nie podano nazw plików spec do budowania" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "nie podano nazw plików tar do budowania" -#: rpmqv.c:736 +#: rpmqv.c:737 #, fuzzy msgid "no packages given for erase" msgstr "nie podano nazw plików do zainstalowania" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "nie podano nazw plików do zainstalowania" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "nie podano argumentów dla trybu zapytań" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "nie podano argumentów dla sprawdzania" -#: rpmqv.c:822 +#: rpmqv.c:823 #, fuzzy msgid "no arguments given" msgstr "nie podano argumentów dla trybu zapytań" @@ -1580,8 +1580,8 @@ 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:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1609,12 +1609,12 @@ msgstr "%s: rpmReadSignature nie powiodło się\n" msgid "%s: No signature available\n" msgstr "%s: Sygnatura nie jest dostępna\n" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead nie powiodło się\n" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 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" @@ -2286,8 +2286,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:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 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" @@ -2301,7 +2301,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:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "żaden pakiet nie zahacza %s\n" @@ -2371,7 +2371,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:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "pakiet %s nie jest zainstalowany\n" @@ -2567,83 +2567,83 @@ msgstr "" msgid "Upgrading packages..." msgstr " --upgrade <nazwa pakietu>" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, 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:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "... jako %s\n" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s pomijany - transmisja %s nie powiodła się\n" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, c-format msgid "package %s is not relocateable\n" msgstr "pakiet %s nie jest przesuwalny\n" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "błąd czytania z pliku %s\n" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "plik %s wymaga nowszej wersji RPM\n" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie może być zainstalowany\n" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, 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:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "niespełnione zależności:\n" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "instalacja pakietów binarnych\n" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nie można otworzyć pliku %s: %s" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" określa wiele pakietów\n" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie można otworzyć %s\n" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "Instalacja %s\n" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -313,35 +313,35 @@ msgstr "o --sign só pode ser usado na criaçăo do pacote" msgid "exec failed\n" msgstr "o exec falhou\n" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "năo foram indicados pacotes para a reconstruçăo" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "năo foram indicados ficheiros spec para a criaçăo" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "năo foram indicados ficheiros tar para a criaçăo" -#: rpmqv.c:736 +#: rpmqv.c:737 msgid "no packages given for erase" msgstr "năo foram indicados pacotes para apagar" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "năo foram indicados pacotes para instalar" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "năo foram indicados argumentos para a pesquisa" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "năo foram indicados argumentos para a verificaçăo" -#: rpmqv.c:822 +#: rpmqv.c:823 #, fuzzy msgid "no arguments given" msgstr "năo foram indicados argumentos para a pesquisa" @@ -1556,8 +1556,8 @@ 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:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1581,12 +1581,12 @@ msgstr "%s: o rpmReadSignature falhou\n" msgid "%s: No signature available\n" msgstr "%s: Nenhuma assinatura disponível\n" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr ":%s: o readLead falhou\n" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: O fread falhou: %s\n" @@ -2229,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:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 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" @@ -2245,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:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "nenhum pacote coincide com %s: %s\n" @@ -2314,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:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "o pacote %s năo está instalado\n" @@ -2511,83 +2511,83 @@ msgstr "A preparar..." msgid "Upgrading packages..." msgstr "actualizar pacote(s)" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, 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:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr " ... como %s\n" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "a ignorar o %s - a transferęncia falhou - %s\n" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, 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:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "erro ao ler do ficheiros %s\n" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, 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:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "o %s năo pode ser instalado\n" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, 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:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "dependęncias falhadas:\n" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "a instalar os pacotes binários\n" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open file %s: %s\n" msgstr "năo consigo aceder ao ficheiro %s: %s\n" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "o \"%s\" especifica vários pacotes\n" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, c-format msgid "cannot open %s: %s\n" msgstr "năo consigo aceder ao %s: %s\n" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "A instalar o %s\n" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 5cfd43bb4..06b5bf7bb 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-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-0400\n" #: build.c:40 #, fuzzy @@ -343,36 +343,36 @@ msgstr "--sign somente pode ser usado durante a construo de pacotes" msgid "exec failed\n" msgstr "Construo falhou.\n" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "no foram passados pacotes para reconstruo" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "no foi passado arquivo spec para construo" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "no foram passados arquivos tar para construo" -#: rpmqv.c:736 +#: rpmqv.c:737 #, fuzzy msgid "no packages given for erase" msgstr "no foi passado pacote para instalao" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "no foi passado pacote para instalao" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "no foi passado argumento para pesquisa" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "no foi passado argumento para verificao" -#: rpmqv.c:822 +#: rpmqv.c:823 #, fuzzy msgid "no arguments given" msgstr "no foi passado argumento para pesquisa" @@ -1701,8 +1701,8 @@ msgstr "No consegui abrir: %s\n" msgid "error creating temporary file %s\n" msgstr "No consegui abrir: %s\n" -#: lib/package.c:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1727,13 +1727,13 @@ msgid "%s: No signature available\n" msgstr "" # , c-format -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "No consegui abrir: %s\n" @@ -2416,8 +2416,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:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "Construo falhou.\n" @@ -2431,7 +2431,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "no foram passados pacotes para assinatura" @@ -2502,7 +2502,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "no foi passado pacote para instalao" @@ -2738,86 +2738,86 @@ msgstr "instale pacote" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, 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:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "no foi passado pacote para instalao" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "no foi passado pacote para instalao" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "lista dependncias do pacote" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 #, fuzzy msgid "installing binary packages\n" msgstr "instale pacote" # , c-format -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" # , c-format -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -295,35 +295,35 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:736 +#: rpmqv.c:737 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:822 +#: rpmqv.c:823 msgid "no arguments given" msgstr "" @@ -1510,8 +1510,8 @@ msgstr "" msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1535,12 +1535,12 @@ msgstr "" msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" @@ -2155,8 +2155,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2170,7 +2170,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "" @@ -2239,7 +2239,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2429,82 +2429,82 @@ msgstr "" msgid "Upgrading packages..." msgstr "" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index dbddc7763..dadb91a5d 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-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -301,35 +301,35 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:736 +#: rpmqv.c:737 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:822 +#: rpmqv.c:823 msgid "no arguments given" msgstr "" @@ -1516,8 +1516,8 @@ msgstr "" msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1541,12 +1541,12 @@ msgstr "" msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" @@ -2161,8 +2161,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2176,7 +2176,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "" @@ -2245,7 +2245,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2435,82 +2435,82 @@ msgstr "" msgid "Upgrading packages..." msgstr "" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -317,35 +317,35 @@ msgstr "--sign ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎ ÔĎĚŘËĎ ĐŇÉ ÓÂĎŇËĹ ĐÁËĹÔĎ×" msgid "exec failed\n" msgstr "ÚÁĐŐÓË ÎĹ ŐÄÁĚÓŃ\n" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ĐĹŇĹÓÂĎŇËÉ" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "ÎĹ ÚÁÄÁÎ ĆÁĘĚ ÓĐĹĂÉĆÉËÁĂÉÉ ÄĚŃ ÓÂĎŇËÉ ĐÁËĹÔÁ" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "ÎĹ ÚÁÄÁÎŮ tar-ĆÁĘĚŮ ÄĚŃ ÓÂĎŇËÉ ĐÁËĹÔÁ" -#: rpmqv.c:736 +#: rpmqv.c:737 msgid "no packages given for erase" msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ŐÄÁĚĹÎÉŃ" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ŐÓÔÁÎĎ×ËÉ" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "ÎĹ ÚÁÄÁÎŮ ÁŇÇŐÍĹÎÔŮ ÚÁĐŇĎÓÁ" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "ÎĹ ÚÁÄÁÎŮ ÁŇÇŐÍĹÎÔŮ ÄĚŃ ×ĹŇÉĆÉËÁĂÉÉ" -#: rpmqv.c:822 +#: rpmqv.c:823 #, fuzzy msgid "no arguments given" msgstr "ÎĹ ÚÁÄÁÎŮ ÁŇÇŐÍĹÎÔŮ ÚÁĐŇĎÓÁ" @@ -1561,8 +1561,8 @@ msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐÉÓÁÔŘ × %%%s %s\n" msgid "error creating temporary file %s\n" msgstr "ĎŰÉÂËÁ ÓĎÚÄÁÎÉŃ ×ŇĹÍĹÎÎĎÇĎ ĆÁĘĚÁ %s\n" -#: lib/package.c:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1586,12 +1586,12 @@ msgstr "%s: ĎŰÉÂËÁ rpmReadSignature\n" msgid "%s: No signature available\n" msgstr "%s: đĎÄĐÉÓŘ ÎĹÄĎÓÔŐĐÎÁ\n" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: ĎŰÉÂËÁ readLead\n" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: ĎŰÉÂËÁ Fread: %s\n" @@ -2232,8 +2232,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:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n" @@ -2247,7 +2247,7 @@ msgstr "ĎŰÉÂËÁ ÚÁĐŇĎÓÁ %s\n" msgid "old format source packages cannot be queried\n" msgstr "ÚÁĐŇĎÓŮ Ë ÉÓČĎÄÎŮÍ ĐÁËĹÔÁÍ × ÓÔÁŇĎÍ ĆĎŇÍÁÔĹ ÎĹ ĐĎÄÄĹŇÖÉ×ÁŔÔÓŃ\n" -#: lib/query.c:609 lib/rpminstall.c:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "ÎÉ ĎÄÉÎ ĐÁËĹÔ ÎĹ ĐĎÄČĎÄÉÔ Ë %s: %s\n" @@ -2316,7 +2316,7 @@ msgstr "ÎĎÍĹŇ ÚÁĐÉÓÉ ĐÁËĹÔÁ: %u\n" msgid "record %u could not be read\n" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐŇĎŢÉÔÁÔŘ ÚÁĐÉÓŘ %u\n" -#: lib/query.c:907 lib/rpminstall.c:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "ĐÁËĹÔ %s ÎĹ ŐÓÔÁÎĎ×ĚĹÎ\n" @@ -2513,83 +2513,83 @@ msgstr "đĎÄÇĎÔĎ×ËÁ..." msgid "Upgrading packages..." msgstr "ĎÂÎĎ×ÉÔŘ ĐÁËĹÔ(Ů)" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, c-format msgid "Retrieving %s\n" msgstr "úÁÇŇŐÖÁĹÔÓŃ %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr " ... ËÁË %s\n" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s ĐŇĎĐŐÓËÁĹÔÓŃ - ĎŰÉÂËÁ ĐĹŇĹÄÁŢÉ - %s\n" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, c-format msgid "package %s is not relocateable\n" msgstr "ĐÁËĹÔ %s - ÎĹ ĐĹŇĹÍĹÝÁĹÍŮĘ\n" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "ĎŰÉÂËÁ ŢÔĹÎÉŃ ÉÚ ĆÁĘĚÁ %s\n" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "ÄĚŃ ĆÁĘĚÁ %s ÎĹĎÂČĎÄÉÍÁ ÂĎĚĹĹ ÎĎ×ÁŃ ×ĹŇÓÉŃ RPM\n" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s ÎĹ ÍĎÖĹÔ ÂŮÔŘ ŐÓÔÁÎĎ×ĚĹÎ\n" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "ÎÁĘÄĹÎĎ %d ÉÓČĎÄÎŮČ É %d ÂÉÎÁŇÎŮČ ĐÁËĹÔĎ×\n" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "ÎĹŐÄĎ×ĚĹÔ×ĎŇĹÎÎŮĹ ÚÁ×ÉÓÉÍĎÓÔÉ:\n" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "ŐÓÔÁÎÁ×ĚÉ×ÁŔ ÂÉÎÁŇÎŮĹ ĐÁËĹÔŮ\n" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open file %s: %s\n" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĆÁĘĚ %s: %s\n" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ÚÁÄÁĹÔ ÎĹÓËĎĚŘËĎ ĐÁËĹÔĎ×\n" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, c-format msgid "cannot open %s: %s\n" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "őÓÔÁÎÁ×ĚÉ×ÁĹÔÓŃ %s\n" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -313,36 +313,36 @@ msgstr "--sign môže byť použíté iba počas zostavenia balíka" msgid "exec failed\n" msgstr "vykonanie zlyhalo\n" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "neboli zadané žiadne balíky pre znovuzostavenie" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "neboli zadané žiadne spec-súbory pre zostavenie" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "neboli zadané žiadne tar-súbory pre zostavenie" -#: rpmqv.c:736 +#: rpmqv.c:737 #, fuzzy msgid "no packages given for erase" msgstr "neboli zadané žiadne balíky pre inštaláciu" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "neboli zadané žiadne balíky pre inštaláciu" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "neboli zadané žiadne argumenty pre otázku" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "neboli zadané žiadne argumenty pre overenie" -#: rpmqv.c:822 +#: rpmqv.c:823 #, fuzzy msgid "no arguments given" msgstr "neboli zadané žiadne argumenty pre otázku" @@ -1578,8 +1578,8 @@ 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:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1605,12 +1605,12 @@ msgstr "%s: rpmReadSignature zlyhalo\n" msgid "%s: No signature available\n" msgstr "%s: Podpis nie je k dispozícii\n" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead zlyhalo\n" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: readLead zlyhalo\n" @@ -2284,8 +2284,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:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "otvorenie %s zlyhalo\n" @@ -2299,7 +2299,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:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "žiadny z balíkov nespúšťa %s\n" @@ -2369,7 +2369,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:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "balík %s nie je nainštalovaný\n" @@ -2565,83 +2565,83 @@ msgstr "" msgid "Upgrading packages..." msgstr " --upgrade <súbor_balíka>" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, 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:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "... ako %s\n" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s vynechané - prenos zlyhal - %s\n" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "balík %s nie je nainštalovaný\n" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "chyba pri vytváraní dočasného súboru %s" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie je možné nainštalovať\n" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, 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:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "nevyriešené závislosti:\n" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "inštalujú sa binárne balíky\n" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nie je možné otvoriť súbor %s: %s" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" špecifikuje viac balíkov\n" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie je možné otvoriť %s\n" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "Inštaluje sa %s\n" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -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.304 2002/08/05 19:47:06 jbj Exp $ +# $Id: sl.po,v 1.305 2002/08/06 01:42:23 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -312,36 +312,36 @@ msgstr "--sign sme biti podan le ob izgradnji paketa" msgid "exec failed\n" msgstr "izvajanje je bilo neuspešno\n" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "paketi za vnovično izgradnjo niso navedeni" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "datoteka spec za izgradnjo manjka" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "arhiv tar za izgradnjo manjka" -#: rpmqv.c:736 +#: rpmqv.c:737 #, fuzzy msgid "no packages given for erase" msgstr "paketi katere bi bilo potrebno namestiti niso navedeni" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "paketi katere bi bilo potrebno namestiti niso navedeni" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "argumenti za poizvedbo niso podani" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "argumenti za preverjanje niso podani" -#: rpmqv.c:822 +#: rpmqv.c:823 #, fuzzy msgid "no arguments given" msgstr "argumenti za poizvedbo niso podani" @@ -1581,8 +1581,8 @@ 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:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1608,12 +1608,12 @@ msgstr "%s: rpmReadSignature je bil neuspešen\n" msgid "%s: No signature available\n" msgstr "%s: Podpis ni na voljo\n" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead je bil neuspešen\n" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 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" @@ -2284,8 +2284,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:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 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" @@ -2299,7 +2299,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:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "noben paket ne proži %s\n" @@ -2369,7 +2369,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:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "paket %s ni nameščen\n" @@ -2567,83 +2567,83 @@ msgstr "" msgid "Upgrading packages..." msgstr " --upgrade <paket> " -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, 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:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr " ... kot %s\n" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "preskočeno - %s - prenos neuspešen - %s\n" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, c-format msgid "package %s is not relocateable\n" msgstr "paketa %s ni možno premakniti\n" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "napaka pri branju iz datoteke %s\n" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, 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:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s ni možno namestiti\n" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "najdeno %d izvornih in %d binarnih paketov\n" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "neuspešne soodvisnosti:\n" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "nameščanje binarnih paketov\n" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open file %s: %s\n" msgstr "ni možno odpreti datoteke %s: %s\n" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" določa več paketov\n" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, c-format msgid "cannot open %s: %s\n" msgstr "ni možno odpreti %s: %s\n" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "Nameščanje %s\n" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" @@ -308,36 +308,36 @@ msgstr "--sign se može koristiti samo kod kreiranja paketa" msgid "exec failed\n" msgstr "%s: Neuspelo otvaranje\n" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "nedosataje paket za rekreiranje" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "nedostaje specifikacije za kreiranje" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "nedostaju 'tar' datoteke za kreiranje" -#: rpmqv.c:736 +#: rpmqv.c:737 #, fuzzy msgid "no packages given for erase" msgstr "nedostaje paket za instalaciju" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "nedostaje paket za instalaciju" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "nedostaju argumenti za upit" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "nedostaju argumenti za proveru" -#: rpmqv.c:822 +#: rpmqv.c:823 #, fuzzy msgid "no arguments given" msgstr "nedostaju argumenti za upit" @@ -1566,8 +1566,8 @@ 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:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1593,12 +1593,12 @@ msgstr "%s: Neuspelo 'rpmReadSignature'\n" msgid "%s: No signature available\n" msgstr "%s: Potpis nije na raspolaganju\n" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Neuspeo 'readLead'\n" @@ -2275,8 +2275,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:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "neuspelo otvaranje %s: %s\n" @@ -2290,7 +2290,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:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "nijedan paket ne aktivira %s\n" @@ -2360,7 +2360,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:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "paket %s nije instaliran\n" @@ -2555,84 +2555,84 @@ msgstr "" msgid "Upgrading packages..." msgstr "instaliraj paket" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, c-format msgid "Retrieving %s\n" msgstr "Pribavljam %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "greška: preskačem %s - neuspelo prenošenje - %s\n" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "paket %s nije instaliran\n" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "greška kod kreiranja direktorijuma %s: %s" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 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:580 +#: lib/rpminstall.c:579 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "grupa %s ne sadrži nijedan paket\n" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "loše međuzavisnosti:\n" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 #, fuzzy msgid "installing binary packages\n" msgstr "instaliraj paket" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" određuje više paketa\n" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "greška: ne mogu da otvorim %s\n" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "Instaliram %s\n" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.1\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -307,35 +307,35 @@ msgstr "--sign kan enbart användas vid pakettillverkning" msgid "exec failed\n" msgstr "exec misslyckades\n" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "inga paketfiler angivna för omtillverkning" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "inga specfiler angivna för tillverkning" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "inga tar-filer angivna för tillverkning" -#: rpmqv.c:736 +#: rpmqv.c:737 msgid "no packages given for erase" msgstr "inga paket angivna att radera" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "inga paket angivna för installation" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "inga parametrar angivna för frĺga" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "inga parametrar angivna för verifiering" -#: rpmqv.c:822 +#: rpmqv.c:823 msgid "no arguments given" msgstr "inga argument angivna" @@ -1536,8 +1536,8 @@ 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:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 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" @@ -1561,12 +1561,12 @@ msgstr "%s: rpmReadSignature misslyckades\n" msgid "%s: No signature available\n" msgstr "%s: Ingen signatur tillgänglig\n" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, c-format msgid "%s: headerRead failed\n" msgstr "%s: headerRead misslyckades\n" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread misslyckades: %s\n" @@ -2195,8 +2195,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:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 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" @@ -2210,7 +2210,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:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "%s: inte en paketlastspecifikation: %s\n" @@ -2279,7 +2279,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:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "paket %s är inte installerat\n" @@ -2474,82 +2474,82 @@ msgstr "Förbereder..." msgid "Upgrading packages..." msgstr "uppgradera paket" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, 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:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr " ... som %s\n" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "hoppar över %s - överföring misslyckades - %s\n" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, c-format msgid "package %s is not relocateable\n" msgstr "paket %s är inte relokerbart\n" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "fel vid läsning frĺn fil %s\n" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, 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:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s kan inte installeras\n" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "hittade %d käll- och %d binärpaket\n" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "Ouppfyllda beroenden:\n" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr " Föreslagna lösningar:\n" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "installerar binärpaket\n" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open file %s: %s\n" msgstr "kan inte öppna filen %s: %s\n" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" anger flera paket\n" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "Installerar %s\n" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -315,36 +315,36 @@ msgstr "--sign sadece paket oluţturulurken kullanýlabilir" msgid "exec failed\n" msgstr "icra baţarýsýz\n" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "yeniden oluţturmak için paket dosyalarý belirtilmemiţ" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "oluţturma için gerekli spec dosyasý belirtilmemiţ" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "oluţturma için gereken tar dosyalarý belirtilmemiţ" -#: rpmqv.c:736 +#: rpmqv.c:737 #, fuzzy msgid "no packages given for erase" msgstr "yüklenecek paket(ler) belirtilmedi" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "yüklenecek paket(ler) belirtilmedi" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "sorgulama için hiç argüman belirtilmedi" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "denetleme için hiç argüman belirtilmedi" -#: rpmqv.c:822 +#: rpmqv.c:823 #, fuzzy msgid "no arguments given" msgstr "sorgulama için hiç argüman belirtilmedi" @@ -1569,8 +1569,8 @@ 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:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1596,12 +1596,12 @@ msgstr "%s: rpmReadSignature baţarýsýz\n" msgid "%s: No signature available\n" msgstr "%s: Ýmza bulundurmuyor\n" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead baţarýsýz\n" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 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" @@ -2247,8 +2247,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:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "%s açýlamadý: %s\n" @@ -2262,7 +2262,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:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, fuzzy, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "%s tetikleyen paket yok\n" @@ -2331,7 +2331,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:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "%s paketi kurulu deđil\n" @@ -2528,83 +2528,83 @@ msgstr "Hazýrlanýyor..." msgid "Upgrading packages..." msgstr "paket günceller" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, 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:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "... %s olarak\n" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s atlanýyor - aktarým baţarýsýz - %s\n" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, c-format msgid "package %s is not relocateable\n" msgstr "%s paketi yeniden konumlandýrýlamaz\n" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "%s dosyasýndan okuma hatalý\n" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, 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:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "%s yüklenemedi\n" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "%d kaynak ve %d icra edilebilir paketi bulundu\n" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 #, fuzzy msgid "Failed dependencies:\n" msgstr "bađýmlýlýklarda hata; gerekli paketler:\n" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "icra edilebilir paketleri kuruluyor\n" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open file %s: %s\n" msgstr "%s dosyasý açýlamadý: %s\n" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" birden fazla paketi tanýmlýyor\n" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, c-format msgid "cannot open %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "%s kuruluyor\n" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -300,35 +300,35 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:736 +#: rpmqv.c:737 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:822 +#: rpmqv.c:823 msgid "no arguments given" msgstr "" @@ -1515,8 +1515,8 @@ msgstr "" msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1540,12 +1540,12 @@ msgstr "" msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" @@ -2160,8 +2160,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2175,7 +2175,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "" @@ -2244,7 +2244,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2434,82 +2434,82 @@ msgstr "" msgid "Upgrading packages..." msgstr "" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -300,35 +300,35 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:736 +#: rpmqv.c:737 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:822 +#: rpmqv.c:823 msgid "no arguments given" msgstr "" @@ -1515,8 +1515,8 @@ msgstr "" msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1540,12 +1540,12 @@ msgstr "" msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" @@ -2160,8 +2160,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2175,7 +2175,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "" @@ -2244,7 +2244,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2434,82 +2434,82 @@ msgstr "" msgid "Upgrading packages..." msgstr "" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -300,35 +300,35 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:736 +#: rpmqv.c:737 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:822 +#: rpmqv.c:823 msgid "no arguments given" msgstr "" @@ -1515,8 +1515,8 @@ msgstr "" msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1540,12 +1540,12 @@ msgstr "" msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" @@ -2160,8 +2160,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2175,7 +2175,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "" @@ -2244,7 +2244,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2434,82 +2434,82 @@ msgstr "" msgid "Upgrading packages..." msgstr "" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 7c16f7962..a60abfc77 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-08-05 15:45-0400\n" +"POT-Creation-Date: 2002-08-05 21:40-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" @@ -300,35 +300,35 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:644 +#: rpmqv.c:645 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:712 +#: rpmqv.c:713 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:714 +#: rpmqv.c:715 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:736 +#: rpmqv.c:737 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:776 +#: rpmqv.c:777 msgid "no packages given for install" msgstr "" -#: rpmqv.c:792 +#: rpmqv.c:793 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:806 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:822 +#: rpmqv.c:823 msgid "no arguments given" msgstr "" @@ -1515,8 +1515,8 @@ msgstr "" msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:442 lib/package.c:482 lib/package.c:693 lib/package.c:717 -#: lib/package.c:747 lib/rpmchecksig.c:767 +#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709 +#: lib/package.c:739 lib/rpmchecksig.c:767 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" @@ -1540,12 +1540,12 @@ msgstr "" msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:659 lib/rpmchecksig.c:586 +#: lib/package.c:651 lib/rpmchecksig.c:586 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/package.c:759 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 +#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" @@ -2160,8 +2160,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:421 lib/rpminstall.c:552 -#: lib/rpminstall.c:952 tools/rpmgraph.c:127 tools/rpmgraph.c:164 +#: lib/query.c:565 lib/query.c:599 lib/rpminstall.c:420 lib/rpminstall.c:551 +#: lib/rpminstall.c:950 tools/rpmgraph.c:127 tools/rpmgraph.c:164 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2175,7 +2175,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:609 lib/rpminstall.c:565 +#: lib/query.c:609 lib/rpminstall.c:564 #, c-format msgid "%s: not an rpm package (or package manifest): %s\n" msgstr "" @@ -2244,7 +2244,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:907 lib/rpminstall.c:733 +#: lib/query.c:907 lib/rpminstall.c:731 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2434,82 +2434,82 @@ msgstr "" msgid "Upgrading packages..." msgstr "" -#: lib/rpminstall.c:368 +#: lib/rpminstall.c:367 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:381 +#: lib/rpminstall.c:380 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:385 +#: lib/rpminstall.c:384 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:476 +#: lib/rpminstall.c:475 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:526 +#: lib/rpminstall.c:525 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:532 +#: lib/rpminstall.c:531 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:544 lib/rpminstall.c:808 tools/rpmgraph.c:156 +#: lib/rpminstall.c:543 lib/rpminstall.c:806 tools/rpmgraph.c:156 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:580 +#: lib/rpminstall.c:579 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:594 lib/rpminstall.c:761 lib/rpminstall.c:1154 +#: lib/rpminstall.c:593 lib/rpminstall.c:759 lib/rpminstall.c:1152 #: tools/rpmgraph.c:202 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:601 tools/rpmgraph.c:208 +#: lib/rpminstall.c:600 tools/rpmgraph.c:208 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:631 +#: lib/rpminstall.c:630 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:655 +#: lib/rpminstall.c:654 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:736 +#: lib/rpminstall.c:734 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:795 +#: lib/rpminstall.c:793 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:801 +#: lib/rpminstall.c:799 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1148 +#: lib/rpminstall.c:1146 #, c-format msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n" msgstr "" diff --git a/python/rpmmodule.c b/python/rpmmodule.c index 2ba2b484a..67333871c 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -558,6 +558,22 @@ void initrpm(void) REGISTER_ENUM(RPMMIRE_REGEX); REGISTER_ENUM(RPMMIRE_GLOB); + REGISTER_ENUM(RPMVSF_DEFAULT); + REGISTER_ENUM(RPMVSF_NOHDRCHK); + REGISTER_ENUM(RPMVSF_NEEDPAYLOAD); + REGISTER_ENUM(RPMVSF_NOSHA1HEADER); + REGISTER_ENUM(RPMVSF_NOMD5HEADER); + REGISTER_ENUM(RPMVSF_NODSAHEADER); + REGISTER_ENUM(RPMVSF_NORSAHEADER); + REGISTER_ENUM(RPMVSF_NOSHA1); + REGISTER_ENUM(RPMVSF_NOMD5); + REGISTER_ENUM(RPMVSF_NODSA); + REGISTER_ENUM(RPMVSF_NORSA); + REGISTER_ENUM(_RPMVSF_NODIGESTS); + REGISTER_ENUM(_RPMVSF_NOSIGNATURES); + REGISTER_ENUM(_RPMVSF_NOHEADER); + REGISTER_ENUM(_RPMVSF_NOPAYLOAD); + PyDict_SetItemString(d, "RPMAL_NOMATCH", o=PyInt_FromLong( (long)RPMAL_NOMATCH )); Py_DECREF(o); } diff --git a/python/rpmts-py.c b/python/rpmts-py.c index 686d3ab51..87eba4dcf 100644 --- a/python/rpmts-py.c +++ b/python/rpmts-py.c @@ -38,13 +38,20 @@ static int _rpmts_debug = 0; * instantiated by the TransactionSet function in the rpm module. * * The TransactionSet function takes two optional arguments. The first - * argument is the root path. The second is the verify signature flags, - * the sum of the following flags: + * argument is the root path. The second is the verify signature disable flags, + * a set of the following bits: * - * - 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. + * - rpm.RPMVSF_NOHDRCHK if set, don't check rpmdb headers + * - rpm.RPMVSF_NEEDPAYLOAD if not set, check header+payload (if possible) + * - rpm.RPMVSF_NOSHA1HEADER if set, don't check header SHA1 digest + * - rpm.RPMVSF_NODSAHEADER if set, don't check header DSA signature + * - rpm.RPMVSF_NOMD5 if set, don't check header+payload MD5 digest + * - rpm.RPMVSF_NODSA if set, don't check header+payload DSA signature + * - rpm.RPMVSF_NORSA if set, don't check header+payload RSA signature + * + * For convenience, there are the following masks: + * - rpm._RPMVSF_NODIGESTS if set, don't check digest(s). + * - rpm._RPMVSF_NOSIGNATURES if set, don't check signature(s). * * A rpm.ts object has the following methods: * @@ -711,20 +718,20 @@ fprintf(stderr, "*** rpmts_HdrCheck(%p) ts %p\n", s, s->ts); /** \ingroup python */ static PyObject * -rpmts_SetVerifySigFlags(rpmtsObject * s, PyObject * args) +rpmts_SetVSFlags(rpmtsObject * s, PyObject * args) /*@globals _Py_NoneStruct @*/ /*@modifies s, _Py_NoneStruct @*/ { - int vsflags; + rpmVSFlags vsflags; if (_rpmts_debug) -fprintf(stderr, "*** rpmts_SetVerifySigFlags(%p) ts %p\n", s, s->ts); +fprintf(stderr, "*** rpmts_SetVSFlags(%p) ts %p\n", s, s->ts); - if (!PyArg_ParseTuple(args, "i:SetVerifySigFlags", &vsflags)) return NULL; + if (!PyArg_ParseTuple(args, "i:SetVSFlags", &vsflags)) return NULL; /* XXX FIXME: value check on vsflags. */ - return Py_BuildValue("i", rpmtsSetVerifySigFlags(s->ts, vsflags)); + return Py_BuildValue("i", rpmtsSetVSFlags(s->ts, vsflags)); } /** \ingroup python @@ -1047,13 +1054,18 @@ static struct PyMethodDef rpmts_methods[] = { - Read a package header from a file descriptor.\n" }, {"hdrCheck", (PyCFunction) rpmts_HdrCheck, METH_VARARGS, NULL }, - {"setVerifySigFlags",(PyCFunction) rpmts_SetVerifySigFlags, METH_VARARGS, -"ts.setVerifySigFlags(vsflags) -> ovsflags\n\ + {"setVSFlags",(PyCFunction) rpmts_SetVSFlags, METH_VARARGS, +"ts.setVSFlags(vsflags) -> ovsflags\n\ - Set signature verification flags. Values for vsflags are:\n\ - 1 --nodigest if set, don't check digest\n\ - 2 --nosignature if set, don't check signature\n\ - 4 (none) if set, check header+payload (if possible)\n\ - 8 --nohdrchk if set, don't check rpmdb headers\n" }, + rpm.RPMVSF_NOHDRCHK if set, don't check rpmdb headers\n\ + rpm.RPMVSF_NEEDPAYLOAD if not set, check header+payload (if possible)\n\ + rpm.RPMVSF_NOSHA1HEADER if set, don't check header SHA1 digest\n\ + rpm.RPMVSF_NODSAHEADER if set, don't check header DSA signature\n\ + rpm.RPMVSF_NOMD5 if set, don't check header+payload MD5 digest\n\ + rpm.RPMVSF_NODSA if set, don't check header+payload DSA signature\n\ + rpm.RPMVSF_NORSA if set, don't check header+payload RSA signature\n\ + rpm._RPMVSF_NODIGESTS if set, don't check digest(s)\n\ + rpm._RPMVSF_NOSIGNATURES if set, don't check signature(s)\n" }, {"getKeys", (PyCFunction) rpmts_GetKeys, METH_VARARGS, NULL }, {"dbMatch", (PyCFunction) rpmts_Match, METH_VARARGS, @@ -1188,7 +1200,7 @@ rpmts_Create(/*@unused@*/ PyObject * self, PyObject * args) o->ts = rpmtsCreate(); (void) rpmtsSetRootDir(o->ts, rootDir); - (void) rpmtsSetVerifySigFlags(o->ts, vsflags); + (void) rpmtsSetVSFlags(o->ts, vsflags); o->keyList = PyList_New(0); o->scriptFd = NULL; diff --git a/rpm.spec.in b/rpm.spec.in index 8b48dc09c..e3819bf3a 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.71 +Release: 0.73 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Copyright: GPL @@ -528,6 +528,7 @@ fi - python: the death of rpm.headerFromPackage(), use ts.hdrFromFdno(). - python: permit direct ts.dbMatch() python iterations. - python: the death of rpm.checksig(), use ts.hdrFromFdno() instead. +- add bitmask for precise control of signature/digest verification. * Sun Aug 4 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.68 - resurrect --rollback. diff --git a/rpm2cpio.c b/rpm2cpio.c index ed5282b6f..a57e53cc8 100644 --- a/rpm2cpio.c +++ b/rpm2cpio.c @@ -31,13 +31,13 @@ int main(int argc, char **argv) fdo = fdDup(STDOUT_FILENO); { rpmts ts = rpmtsCreate(); - int vsflags = 0; + rpmVSFlags vsflags = 0; /* XXX retain the ageless behavior of rpm2cpio */ - vsflags |= _RPMTS_VSF_NODIGESTS; - vsflags |= _RPMTS_VSF_NOSIGNATURES; - vsflags |= _RPMTS_VSF_NOHDRCHK; - (void) rpmtsSetVerifySigFlags(ts, vsflags); + vsflags |= _RPMVSF_NODIGESTS; + vsflags |= _RPMVSF_NOSIGNATURES; + vsflags |= RPMVSF_NOHDRCHK; + (void) rpmtsSetVSFlags(ts, vsflags); /*@-mustmod@*/ /* LCL: segfault */ rc = rpmReadPackageFile(ts, fdi, "rpm2cpio", &h); @@ -623,9 +623,10 @@ int main(int argc, const char ** argv) break; case MODE_REBUILDDB: - { int vsflags = rpmExpandNumeric("%{_vsflags_rebuilddb}"); - (void)rpmtsSetVerifySigFlags(ts, (vsflags & ~_RPMTS_VSF_VERIFY_LEGACY)); + { rpmVSFlags vsflags = rpmExpandNumeric("%{_vsflags_rebuilddb}"); + rpmVSFlags ovsflags = rpmtsSetVSFlags(ts, vsflags); ec = rpmtsRebuildDB(ts); + vsflags = rpmtsSetVSFlags(ts, ovsflags); } break; case MODE_VERIFYDB: ec = rpmtsVerifyDB(ts); diff --git a/tools/rpmcache.c b/tools/rpmcache.c index b84a98d8f..820e0aafc 100644 --- a/tools/rpmcache.c +++ b/tools/rpmcache.c @@ -508,10 +508,10 @@ static void initGlobs(/*@unused@*/ rpmts ts, const char ** argv) } } -static int vsflags = _RPMTS_VSF_VERIFY_LEGACY; +static rpmVSFlags vsflags = 0; static struct poptOption optionsTable[] = { - { "nolegacy", '\0', POPT_BIT_CLR, &vsflags, _RPMTS_VSF_VERIFY_LEGACY, + { "nolegacy", '\0', POPT_BIT_SET, &vsflags, RPMVSF_NEEDPAYLOAD, N_("don't verify header+payload signature"), NULL }, { "nocache", '\0', POPT_ARG_VAL, &noCache, -1, @@ -583,12 +583,12 @@ main(int argc, char *const argv[]) ts = rpmtsCreate(); if (rpmcliQueryFlags & VERIFY_DIGEST) - vsflags |= _RPMTS_VSF_NODIGESTS; + vsflags |= _RPMVSF_NODIGESTS; if (rpmcliQueryFlags & VERIFY_SIGNATURE) - vsflags |= _RPMTS_VSF_NOSIGNATURES; + vsflags |= _RPMVSF_NOSIGNATURES; if (rpmcliQueryFlags & VERIFY_HDRCHK) - vsflags |= _RPMTS_VSF_NOHDRCHK; - (void) rpmtsSetVerifySigFlags(ts, vsflags); + vsflags |= RPMVSF_NOHDRCHK; + (void) rpmtsSetVSFlags(ts, vsflags); { int_32 tid = (int_32) time(NULL); (void) rpmtsSetTid(ts, tid); diff --git a/tools/rpmgraph.c b/tools/rpmgraph.c index 601055a63..7b15e4e65 100644 --- a/tools/rpmgraph.c +++ b/tools/rpmgraph.c @@ -17,7 +17,7 @@ static int noDeps = 1; static int noChainsaw = 0; -static int vsflags = _RPMTS_VSF_VERIFY_LEGACY; +static rpmVSFlags vsflags = 0; static inline /*@observer@*/ const char * const identifyDepend(int_32 f) /*@*/ @@ -61,7 +61,7 @@ rpmGraph(rpmts ts, struct rpmInstallArguments_s * ia, const char ** fileArgv) Header h; rpmRC rpmrc; int rc = 0; - int xx; + rpmVSFlags ovsflags; int i; if (fileArgv == NULL) @@ -73,10 +73,10 @@ rpmGraph(rpmts ts, struct rpmInstallArguments_s * ia, const char ** fileArgv) (void) rpmtsSetFlags(ts, tsflags); if (ia->qva_flags & VERIFY_DIGEST) - vsflags |= _RPMTS_VSF_NODIGESTS; + vsflags |= _RPMVSF_NODIGESTS; if (ia->qva_flags & VERIFY_SIGNATURE) - vsflags |= _RPMTS_VSF_NOSIGNATURES; - xx = rpmtsSetVerifySigFlags(ts, (vsflags & ~_RPMTS_VSF_VERIFY_LEGACY)); + vsflags |= _RPMVSF_NOSIGNATURES; + ovsflags = rpmtsSetVSFlags(ts, vsflags); /* Build fully globbed list of arguments in argv[argc]. */ for (fnp = fileArgv; *fnp; fnp++) { @@ -135,9 +135,9 @@ restart: } /* Read the header, verifying signatures (if present). */ - xx = rpmtsSetVerifySigFlags(ts, vsflags); + ovsflags = rpmtsSetVSFlags(ts, vsflags); rpmrc = rpmReadPackageFile(ts, fd, *fnp, &h); - xx = rpmtsSetVerifySigFlags(ts, xx); + ovsflags = rpmtsSetVSFlags(ts, ovsflags); Fclose(fd); fd = NULL; @@ -272,7 +272,7 @@ exit: static struct poptOption optionsTable[] = { { "check", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &noDeps, 0, N_("don't verify package dependencies"), NULL }, - { "nolegacy", '\0', POPT_BIT_CLR, &vsflags, _RPMTS_VSF_VERIFY_LEGACY, + { "nolegacy", '\0', POPT_BIT_SET, &vsflags, RPMVSF_NEEDPAYLOAD, N_("don't verify header+payload signature"), NULL }, { "nochainsaw", '\0', POPT_ARGFLAG_DOC_HIDDEN, &noChainsaw, 0, @@ -301,12 +301,12 @@ main(int argc, char *const argv[]) ts = rpmtsCreate(); if (rpmcliQueryFlags & VERIFY_DIGEST) - vsflags |= _RPMTS_VSF_NODIGESTS; + vsflags |= _RPMVSF_NODIGESTS; if (rpmcliQueryFlags & VERIFY_SIGNATURE) - vsflags |= _RPMTS_VSF_NOSIGNATURES; + vsflags |= _RPMVSF_NOSIGNATURES; if (rpmcliQueryFlags & VERIFY_HDRCHK) - vsflags |= _RPMTS_VSF_NOHDRCHK; - (void) rpmtsSetVerifySigFlags(ts, vsflags); + vsflags |= RPMVSF_NOHDRCHK; + (void) rpmtsSetVSFlags(ts, vsflags); ec = rpmGraph(ts, ia, poptGetArgs(optCon)); |