From d18bbd9bdcfaf031e5ca7b6acd5bcc4d2532d3e4 Mon Sep 17 00:00:00 2001 From: jbj Date: Tue, 12 Mar 2002 16:56:17 +0000 Subject: [PATCH] - drill ts/fi through verify mode, add methods to keep fi abstract. - use mmap when calculating file digests on verify, ~20% faster. CVS patchset: 5352 CVS date: 2002/03/12 16:56:17 --- CHANGES | 2 + beecrypt/config.gnu.h.in | 6 - db3/configure | 2 +- lib/depends.c | 2 +- lib/package.c | 4 +- lib/psm.c | 3 +- lib/rpmal.c | 3 +- lib/rpmcli.h | 15 +-- lib/rpmfi.c | 120 ++++++++++++++++++- lib/rpmfi.h | 89 ++++++++++++++- lib/transaction.c | 36 ++---- lib/verify.c | 291 ++++++++++++++++++----------------------------- po/cs.po | 161 +++++++++++++------------- po/da.po | 162 +++++++++++++------------- po/de.po | 146 +++++++++++------------- po/fi.po | 146 +++++++++++------------- po/fr.po | 146 +++++++++++------------- po/gl.po | 146 +++++++++++------------- po/is.po | 155 ++++++++++++------------- po/ja.po | 166 +++++++++++++-------------- po/ko.po | 159 +++++++++++++------------- po/no.po | 146 +++++++++++------------- po/pl.po | 166 +++++++++++++-------------- po/pt.po | 154 ++++++++++++------------- po/pt_BR.po | 146 +++++++++++------------- po/ro.po | 146 +++++++++++------------- po/rpm.pot | 146 +++++++++++------------- po/ru.po | 162 +++++++++++++------------- po/sk.po | 166 +++++++++++++-------------- po/sl.po | 165 ++++++++++++++------------- po/sr.po | 146 +++++++++++------------- po/sv.po | 161 +++++++++++++------------- po/tr.po | 161 +++++++++++++------------- python/rpmmodule.c | 25 +++- rpm.spec | 2 + rpm.spec.in | 2 + rpmdb/legacy.c | 70 +++++++++--- rpmio/fts.c | 2 +- 38 files changed, 2012 insertions(+), 1914 deletions(-) diff --git a/CHANGES b/CHANGES index a0c9505..b22b378 100644 --- a/CHANGES +++ b/CHANGES @@ -95,6 +95,8 @@ - wire --nodigest/--nosignature options to checksig/query/verify modes. - make --addsign and --resign behave exactly the same. - splint annotationsm, signature cleanup. + - drill ts/fi through verify mode, add methods to keep fi abstract. + - use mmap when calculating file digests on verify, ~20% faster. 4.0.3 -> 4.0.4: - solaris: translate i86pc to i386 (#57182). diff --git a/beecrypt/config.gnu.h.in b/beecrypt/config.gnu.h.in index f93c9e1..b3590a4 100644 --- a/beecrypt/config.gnu.h.in +++ b/beecrypt/config.gnu.h.in @@ -202,9 +202,6 @@ /* Define if you have the header file. */ #undef HAVE_UNISTD_H -/* Name of package */ -#undef PACKAGE - /* The size of a `char', as computed by sizeof. */ #undef SIZEOF_CHAR @@ -244,9 +241,6 @@ /* Define if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Version number of package */ -#undef VERSION - /* Define if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ #undef WORDS_BIGENDIAN diff --git a/db3/configure b/db3/configure index 6380dc6..b8ac63f 100755 --- a/db3/configure +++ b/db3/configure @@ -10,7 +10,7 @@ rm -f config.cache #CFLAGS="-O2 -D_GNU_SOURCE -D_REENTRANT" CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure \ - `echo $* | sed -e "s%CFLAGS=.* --cache-file=.*$% --enable-shared --enable-static --enable-debug --enable-rpc --with-uniquename=_rpmdb --srcdir=$db_dist%"` + `echo $* | sed -e "s%--cache-file=.*$% --enable-shared --enable-static --enable-debug --enable-rpc --with-uniquename=_rpmdb --srcdir=$db_dist%"` # XXX hack to get db-3.3.4 to configure properly #rm -f $db_dist/../db/dist $db_dist/dist diff --git a/lib/depends.c b/lib/depends.c index 2f5e5d1..12b0d02 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -1900,7 +1900,7 @@ int rpmdepCheck(rpmTransactionSet ts, rc = 0; fi = teGetFI(p, RPMTAG_BASENAMES); - if ((fi = tfiInit(fi, 0)) != NULL) + fi = tfiInit(fi, 0); while (tfiNext(fi) >= 0) { const char * fn = tfiGetFN(fi); diff --git a/lib/package.c b/lib/package.c index 6077a05..80ee22e 100644 --- a/lib/package.c +++ b/lib/package.c @@ -450,7 +450,7 @@ fprintf(stderr, "*** RPF: legacy %d nodigests %d nosignatures %d sigtag %d\n", t (void) rpmDigestFinal(ts->dig->md5ctx, NULL, NULL, 0); /*@=branchstate@*/ #else -assert(ts->dig->md5ctx != NULL); +assert(ts->dig->md5ctx == NULL); #endif ts->dig->md5ctx = fddig->hashctx; fddig->hashctx = NULL; @@ -463,7 +463,7 @@ assert(ts->dig->md5ctx != NULL); (void) rpmDigestFinal(ts->dig->sha1ctx, NULL, NULL, 0); /*@=branchstate@*/ #else -assert(ts->dig->sha1ctx != NULL); +assert(ts->dig->sha1ctx == NULL); #endif ts->dig->sha1ctx = fddig->hashctx; fddig->hashctx = NULL; diff --git a/lib/psm.c b/lib/psm.c index 02d0177..ce13e67 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -1267,7 +1267,8 @@ assert(psm->mi == NULL); psm->mi = rpmdbFreeIterator(psm->mi); rc = RPMRC_OK; - if (fc > 0 && fi->fstates == NULL) { + /* XXX lazy alloc here may need to be done elsewhere. */ + if (fi->fstates == NULL && fc > 0) { fi->fstates = xmalloc(sizeof(*fi->fstates) * fc); memset(fi->fstates, RPMFILE_STATE_NORMAL, fc); } diff --git a/lib/rpmal.c b/lib/rpmal.c index b302611..ac4ba00 100644 --- a/lib/rpmal.c +++ b/lib/rpmal.c @@ -398,7 +398,7 @@ fprintf(stderr, "*** add %p[%d]\n", al->list, pkgNum); alp->fi = rpmfiLink(fi, "Files (alAddPackage)"); fi = rpmfiLink(alp->fi, "Files index (alAddPackage)"); - if ((fi = tfiInit(fi, 0)) != NULL) + fi = tfiInit(fi, 0); if (tfiGetFC(fi) > 0) { int * dirMapping; dirInfo dieNeedle = @@ -471,7 +471,6 @@ fprintf(stderr, "+++ die[%3d] %p [%d] %s\n", al->numDirs, die, die->dirNameLen, /* Rewind to first file, generate file index entry for each file. */ fi = tfiInit(fi, first); - if (fi != NULL) while ((first = tfiNext(fi)) >= 0 && first < next) { /*@-assignexpose -onlytrans @*/ fie->baseName = tfiGetBN(fi); diff --git a/lib/rpmcli.h b/lib/rpmcli.h index cc665a3..bbdba00 100644 --- a/lib/rpmcli.h +++ b/lib/rpmcli.h @@ -331,17 +331,16 @@ int rpmcliQuery(rpmTransactionSet ts, QVA_t qva, /*@null@*/ const char ** argv) /** \ingroup rpmcli * Verify file attributes (including MD5 sum). * @todo gnorpm and python bindings prevent this from being static. - * @param root path to top of install tree - * @param h header - * @param filenum index of file in header file info arrays + * @param ts transaction set + * @param fi file info (with linked header and current file index) * @retval result address of bit(s) returned to indicate failure * @param omitMask bit(s) to disable verify checks * @return 0 on success (or not installed), 1 on error */ -int rpmVerifyFile(const char * root, Header h, int filenum, +int rpmVerifyFile(const rpmTransactionSet ts, TFI_t fi, /*@out@*/ rpmVerifyAttrs * result, rpmVerifyAttrs omitMask) /*@globals fileSystem @*/ - /*@modifies h, *result, fileSystem @*/; + /*@modifies fi, *result, fileSystem @*/; /** \ingroup rpmcli * Display results of package verify. @@ -351,10 +350,8 @@ int rpmVerifyFile(const char * root, Header h, int filenum, * @return result of last non-zero verify return */ int showVerifyPackage(QVA_t qva, rpmTransactionSet ts, Header h) - /*@globals rpmGlobalMacroContext, - fileSystem, internalState @*/ - /*@modifies ts, h, rpmGlobalMacroContext, - fileSystem, internalState @*/; + /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/ + /*@modifies ts, h, rpmGlobalMacroContext, fileSystem, internalState @*/; /** * Check original header digest. diff --git a/lib/rpmfi.c b/lib/rpmfi.c index 1c85a0a..2b332af 100644 --- a/lib/rpmfi.c +++ b/lib/rpmfi.c @@ -146,6 +146,116 @@ int_32 tfiGetFFlags(TFI_t fi) return FFlags; } +int_32 tfiGetVFlags(TFI_t fi) +{ + int_32 VFlags = 0; + + if (fi != NULL && fi->i >= 0 && fi->i < fi->fc) { + if (fi->vflags != NULL) + VFlags = fi->vflags[fi->i]; + } + return VFlags; +} + +int_16 tfiGetFMode(TFI_t fi) +{ + int_16 fmode = 0; + + if (fi != NULL && fi->i >= 0 && fi->i < fi->fc) { + if (fi->fmodes != NULL) + fmode = fi->fmodes[fi->i]; + } + return fmode; +} + +rpmfileState tfiGetFState(TFI_t fi) +{ + char fstate = 0; + + if (fi != NULL && fi->i >= 0 && fi->i < fi->fc) { + if (fi->fstates != NULL) + fstate = fi->fstates[fi->i]; + } + return fstate; +} + +const unsigned char * tfiGetMD5(TFI_t fi) +{ + unsigned char * md5 = NULL; + + if (fi != NULL && fi->i >= 0 && fi->i < fi->fc) { + if (fi->md5s != NULL) + md5 = fi->md5s + (16 * fi->i); + } + return md5; +} + +const char * tfiGetFLink(TFI_t fi) +{ + const char * flink = NULL; + + if (fi != NULL && fi->i >= 0 && fi->i < fi->fc) { + if (fi->flinks != NULL) + flink = fi->flinks[fi->i]; + } + return flink; +} + +int_32 tfiGetFSize(TFI_t fi) +{ + int_32 fsize = 0; + + if (fi != NULL && fi->i >= 0 && fi->i < fi->fc) { + if (fi->fsizes != NULL) + fsize = fi->fsizes[fi->i]; + } + return fsize; +} + +int_16 tfiGetFRdev(TFI_t fi) +{ + int_16 frdev = 0; + + if (fi != NULL && fi->i >= 0 && fi->i < fi->fc) { + if (fi->frdevs != NULL) + frdev = fi->frdevs[fi->i]; + } + return frdev; +} + +int_32 tfiGetFMtime(TFI_t fi) +{ + int_32 fmtime = 0; + + if (fi != NULL && fi->i >= 0 && fi->i < fi->fc) { + if (fi->fmtimes != NULL) + fmtime = fi->fmtimes[fi->i]; + } + return fmtime; +} + +const char * tfiGetFUser(TFI_t fi) +{ + const char * fuser = NULL; + + if (fi != NULL && fi->i >= 0 && fi->i < fi->fc) { + if (fi->fuser != NULL) + fuser = fi->fuser[fi->i]; + } + return fuser; +} + +const char * tfiGetFGroup(TFI_t fi) +{ + const char * fgroup = NULL; + + if (fi != NULL && fi->i >= 0 && fi->i < fi->fc) { + if (fi->fgroup != NULL) + fgroup = fi->fgroup[fi->i]; + } + return fgroup; +} + int tfiNext(TFI_t fi) { int i = -1; @@ -174,8 +284,11 @@ TFI_t tfiInit(TFI_t fi, int fx) if (fx >= 0 && fx < fi->fc) { fi->i = fx - 1; fi->j = -1; - } else + } +#ifdef DYING + else fi = NULL; +#endif } /*@-refcounttrans@*/ @@ -721,6 +834,7 @@ fprintf(stderr, "*** fi %p\t%s[%d]\n", fi, fi->Type, fi->fc); fi->fmtimes = _free(fi->fmtimes); fi->fmodes = _free(fi->fmodes); fi->fflags = _free(fi->fflags); + fi->vflags = _free(fi->vflags); fi->fsizes = _free(fi->fsizes); fi->frdevs = _free(fi->frdevs); fi->dil = _free(fi->dil); @@ -848,11 +962,12 @@ TFI_t fiNew(rpmTransactionSet ts, TFI_t fi, xx = hge(h, RPMTAG_DIRINDEXES, NULL, (void **) &fi->dil, NULL); xx = hge(h, RPMTAG_FILEMODES, NULL, (void **) &fi->fmodes, NULL); xx = hge(h, RPMTAG_FILEFLAGS, NULL, (void **) &fi->fflags, NULL); + xx = hge(h, RPMTAG_FILEVERIFYFLAGS, NULL, (void **) &fi->vflags, NULL); xx = hge(h, RPMTAG_FILESIZES, NULL, (void **) &fi->fsizes, NULL); xx = hge(h, RPMTAG_FILESTATES, NULL, (void **) &fi->fstates, NULL); if (xx == 0 || fi->fstates == NULL) fi->fstates = xcalloc(fi->fc, sizeof(*fi->fstates)); - else if (!scareMem) + else _fdupe(fi, fstates); fi->action = FA_UNKNOWN; @@ -914,6 +1029,7 @@ TFI_t fiNew(rpmTransactionSet ts, TFI_t fi, _fdupe(fi, frdevs); _fdupe(fi, fsizes); _fdupe(fi, fflags); + _fdupe(fi, vflags); _fdupe(fi, fmodes); _fdupe(fi, dil); fi->h = headerFree(fi->h, fi->Type); diff --git a/lib/rpmfi.h b/lib/rpmfi.h index cf6379a..0be2b3f 100644 --- a/lib/rpmfi.h +++ b/lib/rpmfi.h @@ -70,6 +70,9 @@ struct TFI_s { /*@only@*/ /*@null@*/ char * fstates; /*!< File state(s) (from header) */ +/*@only@*/ /*?null?*/ + const uint_32 * vflags; /*!< File verify flag(s) (from header) */ + int_32 dc; /*!< No. of directories. */ int_32 fc; /*!< No. of files. */ @@ -265,6 +268,90 @@ int_32 tfiGetFFlags(/*@null@*/ TFI_t fi) /*@*/; /** + * Return current file verify flags from file info set. + * @param fi file info set + * @return current file verify flags, 0 on invalid + */ +int_32 tfiGetVFlags(/*@null@*/ TFI_t fi) + /*@*/; + +/** + * Return current file mode from file info set. + * @param fi file info set + * @return current file mode, 0 on invalid + */ +int_16 tfiGetFMode(/*@null@*/ TFI_t fi) + /*@*/; + +/** + * Return current file state from file info set. + * @param fi file info set + * @return current file state, 0 on invalid + */ +rpmfileState tfiGetFState(/*@null@*/ TFI_t fi) + /*@*/; + +/** + * Return current file (binary) md5 digest from file info set. + * @param fi file info set + * @return current file md5 digest, NULL on invalid + */ +/*@observer@*/ /*@null@*/ +const unsigned char * tfiGetMD5(/*@null@*/ TFI_t fi) + /*@*/; + +/** + * Return current file linkto (i.e. symlink(2) target) from file info set. + * @param fi file info set + * @return current file linkto, NULL on invalid + */ +/*@observer@*/ /*@null@*/ +const char * tfiGetFLink(/*@null@*/ TFI_t fi) + /*@*/; + +/** + * Return current file size from file info set. + * @param fi file info set + * @return current file size, 0 on invalid + */ +int_32 tfiGetFSize(/*@null@*/ TFI_t fi) + /*@*/; + +/** + * Return current file rdev from file info set. + * @param fi file info set + * @return current file rdev, 0 on invalid + */ +int_16 tfiGetFRdev(/*@null@*/ TFI_t fi) + /*@*/; + +/** + * Return current file modify time from file info set. + * @param fi file info set + * @return current file modify time, 0 on invalid + */ +int_32 tfiGetFMtime(/*@null@*/ TFI_t fi) + /*@*/; + +/** + * Return current file owner from file info set. + * @param fi file info set + * @return current file owner, NULL on invalid + */ +/*@observer@*/ /*@null@*/ +const char * tfiGetFUser(/*@null@*/ TFI_t fi) + /*@*/; + +/** + * Return current file group from file info set. + * @param fi file info set + * @return current file group, NULL on invalid + */ +/*@observer@*/ /*@null@*/ +const char * tfiGetFGroup(/*@null@*/ TFI_t fi) + /*@*/; + +/** * Return next file iterator index. * @param fi file info set * @return file iterator index, -1 on termination @@ -276,7 +363,7 @@ int tfiNext(/*@null@*/ TFI_t fi) * Initialize file iterator index. * @param fi file info set * @param fx file iterator index - * @return file info set, NULL if fx is out of range + * @return file info set */ /*@null@*/ TFI_t tfiInit(/*@null@*/ TFI_t fi, int fx) diff --git a/lib/transaction.c b/lib/transaction.c index 17b337b..377069d 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -14,13 +14,6 @@ #include "legacy.h" /* XXX domd5 */ #include "misc.h" /* XXX stripTrailingChar, splitString, currentDirectory */ -#ifdef DYING -/*@-redecl -exportheadervar@*/ -/*@unchecked@*/ -extern const char * chroot_prefix; -/*@=redecl =exportheadervar@*/ -#endif - /* XXX FIXME: merge with existing (broken?) tests in system.h */ /* portability fiddles */ #if STATFS_IN_SYS_STATVFS @@ -562,7 +555,7 @@ static void handleOverlappedFiles(const rpmTransactionSet ts, int i, j; fi = tfiInit(fi, 0); - if (fi != NULL) + if (fi != NULL) /* XXX lclint */ while ((i = tfiNext(fi)) >= 0) { struct fingerPrint_s * fiFps; int otherPkgNum, otherFileNum; @@ -854,7 +847,8 @@ static void skipFiles(const rpmTransactionSet ts, TFI_t fi) dff = alloca(dc * sizeof(*dff)); memset(dff, 0, dc * sizeof(*dff)); - if ((fi = tfiInit(fi, 0)) != NULL) + fi = tfiInit(fi, 0); + if (fi != NULL) /* XXX lclint */ while ((i = tfiNext(fi)) >= 0) { char **nsp; @@ -970,7 +964,8 @@ static void skipFiles(const rpmTransactionSet ts, TFI_t fi) } /* If explicitly included in the package, skip the directory. */ - if ((fi = tfiInit(fi, 0)) != NULL) + fi = tfiInit(fi, 0); + if (fi != NULL) /* XXX lclint */ while ((i = tfiNext(fi)) >= 0) { const char * dir; @@ -1228,7 +1223,7 @@ int rpmRunTransactions( rpmTransactionSet ts, continue; /* XXX can't happen */ fc = tfiGetFC(fi); -#ifdef DYING /* XXX W2DO? this is now done teiGetFi, okay ??? */ +#ifdef DYING /* XXX W2DO? this is now done in teiGetFi, okay ??? */ fi->magic = TFIMAGIC; fi->te = p; #endif @@ -1258,13 +1253,6 @@ int rpmRunTransactions( rpmTransactionSet ts, /*@=superuser =noeffect @*/ ts->chrootDone = 1; if (ts->rpmdb) ts->rpmdb->db_chrootDone = 1; -#ifdef DYING - /*@-onlytrans@*/ - /*@-mods@*/ - chroot_prefix = ts->rootDir; - /*@=mods@*/ - /*@=onlytrans@*/ -#endif } ts->ht = htCreate(totalFileCount * 2, 0, 0, fpHashFunction, fpEqual); @@ -1283,7 +1271,8 @@ int rpmRunTransactions( rpmTransactionSet ts, fpLookupList(fpc, fi->dnl, fi->bnl, fi->dil, fc, fi->fps); /*@-branchstate@*/ - if ((fi = tfiInit(fi, 0)) != NULL) + fi = tfiInit(fi, 0); + if (fi != NULL) /* XXX lclint */ while ((i = tfiNext(fi)) >= 0) { if (XFA_SKIPPING(fi->actions[i])) /*@innercontinue@*/ continue; @@ -1328,14 +1317,14 @@ int rpmRunTransactions( rpmTransactionSet ts, } numShared = 0; - if ((fi = tfiInit(fi, 0)) != NULL) + fi = tfiInit(fi, 0); while ((i = tfiNext(fi)) >= 0) numShared += dbiIndexSetCount(matches[i]); /* Build sorted file info list for this package. */ shared = sharedList = xcalloc((numShared + 1), sizeof(*sharedList)); - if ((fi = tfiInit(fi, 0)) != NULL) + fi = tfiInit(fi, 0); while ((i = tfiNext(fi)) >= 0) { /* * Take care not to mark files as replaced in packages that will @@ -1451,11 +1440,6 @@ int rpmRunTransactions( rpmTransactionSet ts, /*@=superuser =noeffect @*/ ts->chrootDone = 0; if (ts->rpmdb) ts->rpmdb->db_chrootDone = 0; -#ifdef DYING - /*@-mods@*/ - chroot_prefix = NULL; - /*@=mods@*/ -#endif xx = chdir(ts->currDir); } diff --git a/lib/verify.c b/lib/verify.c index 323ad5a..9abc76f 100644 --- a/lib/verify.c +++ b/lib/verify.c @@ -15,62 +15,38 @@ /*@access rpmProblem @*/ /*@access rpmTransactionSet @*/ -/*@access TFI_t @*/ /*@access PSM_t @*/ /*@access FD_t @*/ /* XXX compared with NULL */ #define S_ISDEV(m) (S_ISBLK((m)) || S_ISCHR((m))) -int rpmVerifyFile(const char * root, Header h, int filenum, +int rpmVerifyFile(const rpmTransactionSet ts, const TFI_t fi, rpmVerifyAttrs * result, rpmVerifyAttrs omitMask) { - HGE_t hge = (HGE_t)headerGetEntryMinMemory; - HFD_t hfd = headerFreeData; - int_32 * fileFlags; - rpmfileAttrs fileAttrs = RPMFILE_NONE; - int_32 * verifyFlags; - rpmVerifyAttrs flags = RPMVERIFY_ALL; - unsigned short * modeList; - const char * fileStatesList; - const char * filespec = NULL; - int count; + unsigned short fmode = tfiGetFMode(fi); + rpmfileAttrs fileAttrs = tfiGetFFlags(fi); + rpmVerifyAttrs flags = tfiGetVFlags(fi); + const char * filespec = tfiGetFN(fi); int rc; struct stat sb; - rc = hge(h, RPMTAG_FILEMODES, NULL, (void **) &modeList, &count); - if (hge(h, RPMTAG_FILEFLAGS, NULL, (void **) &fileFlags, NULL)) - fileAttrs = fileFlags[filenum]; - - if (hge(h, RPMTAG_FILEVERIFYFLAGS, NULL, (void **) &verifyFlags, NULL)) - flags = verifyFlags[filenum]; - + /* Prepend the path to root (if specified). */ + if (ts->rootDir && *ts->rootDir != '\0' + && !(ts->rootDir[0] == '/' && ts->rootDir[1] == '\0')) { - const char ** baseNames; - const char ** dirNames; - int_32 * dirIndexes; - rpmTagType bnt, dnt; - - if (hge(h, RPMTAG_BASENAMES, &bnt, (void **) &baseNames, NULL) - && hge(h, RPMTAG_DIRNAMES, &dnt, (void **) &dirNames, NULL) - && hge(h, RPMTAG_DIRINDEXES, NULL, (void **) &dirIndexes, NULL)) - { - int nb = (strlen(dirNames[dirIndexes[filenum]]) + - strlen(baseNames[filenum]) + strlen(root) + 5); - char * t = alloca(nb); - filespec = t; + int nb = strlen(filespec) + strlen(ts->rootDir) + 1; + char * tb = alloca(nb); + char * t; + + t = tb; + *t = '\0'; + t = stpcpy(t, ts->rootDir); + while (t > tb && t[-1] == '/') { + --t; *t = '\0'; - if (root && !(root[0] == '/' && root[1] == '\0')) { - t = stpcpy(t, root); - while (t > filespec && t[-1] == '/') { - --t; - *t = '\0'; - } - } - t = stpcpy(t, dirNames[dirIndexes[filenum]]); - t = stpcpy(t, baseNames[filenum]); } - baseNames = hfd(baseNames, bnt); - dirNames = hfd(dirNames, dnt); + t = stpcpy(t, filespec); + filespec = t; } *result = RPMVERIFY_NONE; @@ -78,27 +54,17 @@ int rpmVerifyFile(const char * root, Header h, int filenum, /* * Check to see if the file was installed - if not pretend all is OK. */ - if (hge(h, RPMTAG_FILESTATES, NULL, (void **) &fileStatesList, NULL) && - fileStatesList != NULL) - { - rpmfileState fstate = fileStatesList[filenum]; - switch (fstate) { - case RPMFILE_STATE_NETSHARED: - case RPMFILE_STATE_REPLACED: - case RPMFILE_STATE_NOTINSTALLED: - return 0; - /*@notreached@*/ break; - case RPMFILE_STATE_NORMAL: - break; - } - } - - if (filespec == NULL) { - *result |= RPMVERIFY_LSTATFAIL; - return 1; + switch (tfiGetFState(fi)) { + case RPMFILE_STATE_NETSHARED: + case RPMFILE_STATE_REPLACED: + case RPMFILE_STATE_NOTINSTALLED: + return 0; + /*@notreached@*/ break; + case RPMFILE_STATE_NORMAL: + break; } - if (Lstat(filespec, &sb) != 0) { + if (filespec == NULL || Lstat(filespec, &sb) != 0) { *result |= RPMVERIFY_LSTATFAIL; return 1; } @@ -141,49 +107,39 @@ int rpmVerifyFile(const char * root, Header h, int filenum, flags &= ~(omitMask | RPMVERIFY_LSTATFAIL|RPMVERIFY_READFAIL|RPMVERIFY_READLINKFAIL); if (flags & RPMVERIFY_MD5) { - unsigned char md5sum[40]; - const char ** md5List; - rpmTagType mdt; + byte md5sum[16]; - if (!hge(h, RPMTAG_FILEMD5S, &mdt, (void **) &md5List, NULL)) - *result |= RPMVERIFY_MD5; + rc = domd5(filespec, md5sum, 0); + if (rc) + *result |= (RPMVERIFY_READFAIL|RPMVERIFY_MD5); else { - rc = domd5(filespec, md5sum, 1); - if (rc) - *result |= (RPMVERIFY_READFAIL|RPMVERIFY_MD5); - else if (strcmp(md5sum, md5List[filenum])) + const byte * md5 = tfiGetMD5(fi); + if (md5 == NULL || memcmp(md5sum, md5, sizeof(md5sum))) *result |= RPMVERIFY_MD5; } - md5List = hfd(md5List, mdt); } if (flags & RPMVERIFY_LINKTO) { char linkto[1024]; int size = 0; - const char ** linktoList; - rpmTagType ltt; - if (!hge(h, RPMTAG_FILELINKTOS, <t, (void **) &linktoList, NULL) - || (size = Readlink(filespec, linkto, sizeof(linkto)-1)) == -1) + if ((size = Readlink(filespec, linkto, sizeof(linkto)-1)) == -1) *result |= (RPMVERIFY_READLINKFAIL|RPMVERIFY_LINKTO); else { + const char * flink = tfiGetFLink(fi); linkto[size] = '\0'; - if (strcmp(linkto, linktoList[filenum])) + if (flink == NULL || strcmp(linkto, flink)) *result |= RPMVERIFY_LINKTO; } - linktoList = hfd(linktoList, ltt); } if (flags & RPMVERIFY_FILESIZE) { - int_32 * sizeList; - - if (!hge(h, RPMTAG_FILESIZES, NULL, (void **) &sizeList, NULL) - || sizeList[filenum] != sb.st_size) + if (sb.st_size != tfiGetFSize(fi)) *result |= RPMVERIFY_FILESIZE; } if (flags & RPMVERIFY_MODE) { - unsigned short metamode = modeList[filenum]; + unsigned short metamode = fmode; unsigned short filemode; /* @@ -205,66 +161,33 @@ int rpmVerifyFile(const char * root, Header h, int filenum, } if (flags & RPMVERIFY_RDEV) { - if (S_ISCHR(modeList[filenum]) != S_ISCHR(sb.st_mode) || - S_ISBLK(modeList[filenum]) != S_ISBLK(sb.st_mode)) + if (S_ISCHR(fmode) != S_ISCHR(sb.st_mode) + || S_ISBLK(fmode) != S_ISBLK(sb.st_mode)) { *result |= RPMVERIFY_RDEV; - } else if (S_ISDEV(modeList[filenum]) && S_ISDEV(sb.st_mode)) { - unsigned short * rdevList; - if (!hge(h, RPMTAG_FILERDEVS, NULL, (void **) &rdevList, NULL) - || rdevList[filenum] != sb.st_rdev) + } else if (S_ISDEV(fmode) && S_ISDEV(sb.st_mode)) { + if (sb.st_rdev != tfiGetFRdev(fi)) *result |= RPMVERIFY_RDEV; } } if (flags & RPMVERIFY_MTIME) { - int_32 * mtimeList; - - if (!hge(h, RPMTAG_FILEMTIMES, NULL, (void **) &mtimeList, NULL) - || mtimeList[filenum] != sb.st_mtime) + if (sb.st_mtime != tfiGetFMtime(fi)) *result |= RPMVERIFY_MTIME; } if (flags & RPMVERIFY_USER) { - const char * name; - const char ** unameList; - int_32 * uidList; - rpmTagType unt; - - if (hge(h, RPMTAG_FILEUSERNAME, &unt, (void **) &unameList, NULL)) { - name = uidToUname(sb.st_uid); - if (!name || strcmp(unameList[filenum], name)) - *result |= RPMVERIFY_USER; - unameList = hfd(unameList, unt); - } else if (hge(h, RPMTAG_FILEUIDS, NULL, (void **) &uidList, NULL)) { - if (uidList[filenum] != sb.st_uid) - *result |= RPMVERIFY_GROUP; - } else { - rpmError(RPMERR_INTERNAL, _("package lacks both user name and id " - "lists (this should never happen)\n")); - *result |= RPMVERIFY_GROUP; - } + const char * name = uidToUname(sb.st_uid); + const char * fuser = tfiGetFUser(fi); + if (name == NULL || fuser == NULL || strcmp(name, fuser)) + *result |= RPMVERIFY_USER; } if (flags & RPMVERIFY_GROUP) { - const char ** gnameList; - int_32 * gidList; - rpmTagType gnt; - gid_t gid; - - if (hge(h, RPMTAG_FILEGROUPNAME, &gnt, (void **) &gnameList, NULL)) { - rc = gnameToGid(gnameList[filenum], &gid); - if (rc || (gid != sb.st_gid)) - *result |= RPMVERIFY_GROUP; - gnameList = hfd(gnameList, gnt); - } else if (hge(h, RPMTAG_FILEGIDS, NULL, (void **) &gidList, NULL)) { - if (gidList[filenum] != sb.st_gid) - *result |= RPMVERIFY_GROUP; - } else { - rpmError(RPMERR_INTERNAL, _("package lacks both group name and id " - "lists (this should never happen)\n")); + const char * name = uidToUname(sb.st_gid); + const char * fgroup = tfiGetFGroup(fi); + if (name == NULL || fgroup == NULL || strcmp(name, fgroup)) *result |= RPMVERIFY_GROUP; - } } return 0; @@ -272,40 +195,43 @@ int rpmVerifyFile(const char * root, Header h, int filenum, /** * Return exit code from running verify script from header. + * @todo malloc/free/refcount handling is fishy here. * @param qva parsed query/verify options * @param ts transaction set * @param h header + * @param fi file info set * @param scriptFd file handle to use for stderr (or NULL) * @return 0 on success */ static int rpmVerifyScript(/*@unused@*/ QVA_t qva, rpmTransactionSet ts, - Header h, /*@null@*/ FD_t scriptFd) - /*@globals rpmGlobalMacroContext, - fileSystem, internalState @*/ - /*@modifies ts, h, rpmGlobalMacroContext, + TFI_t fi, /*@null@*/ FD_t scriptFd) + /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/ + /*@modifies ts, fi, rpmGlobalMacroContext, fileSystem, internalState @*/ { - PSM_t psm = memset(alloca(sizeof(*psm)), 0, sizeof(*psm)); int rc = 0; + FD_t savefd = NULL; + PSM_t psm; + psm = memset(alloca(sizeof(*psm)), 0, sizeof(*psm)); psm->ts = rpmtsLink(ts, "rpmVerifyScript"); - if (scriptFd != NULL) + if (scriptFd != NULL) { + savefd = ts->scriptFd; ts->scriptFd = fdLink(scriptFd, "rpmVerifyScript"); - - psm->fi = fiNew(ts, NULL, h, RPMTAG_BASENAMES, 1); - if (psm->fi != NULL) { /* XXX can't happen */ - psm->stepName = "verify"; - psm->scriptTag = RPMTAG_VERIFYSCRIPT; - psm->progTag = RPMTAG_VERIFYSCRIPTPROG; - rc = psmStage(psm, PSM_SCRIPT); } - psm->fi = fiFree(psm->fi, 1); - if (ts->scriptFd != NULL) - ts->scriptFd = fdFree(ts->scriptFd, "rpmVerifyScript"); + psm->fi = rpmfiLink(fi, "rpmVerifyScript"); + psm->stepName = "verify"; + psm->scriptTag = RPMTAG_VERIFYSCRIPT; + psm->progTag = RPMTAG_VERIFYSCRIPTPROG; + rc = psmStage(psm, PSM_SCRIPT); + psm->fi = rpmfiUnlink(fi, "rpmVerifyScript"); - rpmtransClean(ts); /* XXX this is sure to cause heartburn */ + if (scriptFd != NULL) { + ts->scriptFd = fdFree(ts->scriptFd, "rpmVerifyScript"); + ts->scriptFd = savefd; + } psm->ts = rpmtsUnlink(ts, "rpmVerifyScript"); @@ -359,19 +285,15 @@ int rpmVerifyDigest(Header h) * Check file info from header against what's actually installed. * @param qva parsed query/verify options * @param ts transaction set - * @param h header + * @param fi file info set * @return 0 no problems, 1 problems found */ -static int verifyHeader(QVA_t qva, /*@unused@*/ rpmTransactionSet ts, Header h) +static int verifyHeader(QVA_t qva, const rpmTransactionSet ts, TFI_t fi) /*@globals fileSystem, internalState @*/ - /*@modifies h, fileSystem, internalState @*/ + /*@modifies fi, fileSystem, internalState @*/ { - HGE_t hge = (HGE_t)headerGetEntryMinMemory; char buf[BUFSIZ]; char * t, * te; - const char ** fileNames = NULL; - int count; - int_32 * fileFlags = NULL; rpmVerifyAttrs verifyResult = 0; /*@-type@*/ /* FIX: union? */ rpmVerifyAttrs omitMask = ((qva->qva_flags & VERIFY_ATTRS) ^ VERIFY_ATTRS); @@ -382,30 +304,24 @@ static int verifyHeader(QVA_t qva, /*@unused@*/ rpmTransactionSet ts, Header h) te = t = buf; *te = '\0'; - if (!hge(h, RPMTAG_FILEFLAGS, NULL, (void **) &fileFlags, NULL)) - goto exit; - - if (!headerIsEntry(h, RPMTAG_BASENAMES)) - goto exit; - - rpmBuildFileList(h, &fileNames, &count); - - for (i = 0; i < count; i++) - { + fi = rpmfiLink(fi, "verifyHeader"); + fi = tfiInit(fi, 0); + if (fi != NULL) /* XXX lclint */ + while ((i = tfiNext(fi)) >= 0) { rpmfileAttrs fileAttrs; int rc; - fileAttrs = fileFlags[i]; + fileAttrs = tfiGetFFlags(fi); /* If not verifying %ghost, skip ghost files. */ if (!(qva->qva_fflags & RPMFILE_GHOST) && (fileAttrs & RPMFILE_GHOST)) continue; - rc = rpmVerifyFile(ts->rootDir, h, i, &verifyResult, omitMask); + rc = rpmVerifyFile(ts, fi, &verifyResult, omitMask); if (rc) { if (!(fileAttrs & RPMFILE_MISSINGOK) || rpmIsVerbose()) { - sprintf(te, _("missing %s"), fileNames[i]); + sprintf(te, _("missing %s"), tfiGetFN(fi)); te += strlen(te); ec = rc; } @@ -446,7 +362,7 @@ static int verifyHeader(QVA_t qva, /*@unused@*/ rpmTransactionSet ts, Header h) (fileAttrs & RPMFILE_GHOST) ? 'g' : (fileAttrs & RPMFILE_LICENSE) ? 'l' : (fileAttrs & RPMFILE_README) ? 'r' : ' '), - fileNames[i]); + tfiGetFN(fi)); te += strlen(te); } @@ -458,9 +374,8 @@ static int verifyHeader(QVA_t qva, /*@unused@*/ rpmTransactionSet ts, Header h) *t = '\0'; } } + fi = rpmfiUnlink(fi, "verifyHeader"); -exit: - fileNames = _free(fileNames); return ec; } @@ -530,6 +445,8 @@ static int verifyDependencies(/*@unused@*/ QVA_t qva, rpmTransactionSet ts, int showVerifyPackage(QVA_t qva, rpmTransactionSet ts, Header h) { + int scareMem = 1; /* XXX only rpmVerifyScript needs now */ + TFI_t fi; int ec = 0; int rc; @@ -545,21 +462,31 @@ int showVerifyPackage(QVA_t qva, rpmTransactionSet ts, Header h) } } #endif - if (qva->qva_flags & VERIFY_DEPS) { - if ((rc = verifyDependencies(qva, ts, h)) != 0) - ec = rc; - } - if (qva->qva_flags & VERIFY_FILES) { - if ((rc = verifyHeader(qva, ts, h)) != 0) - ec = rc; - } - if (qva->qva_flags & VERIFY_SCRIPT) { - FD_t fdo = fdDup(STDOUT_FILENO); - if ((rc = rpmVerifyScript(qva, ts, h, fdo)) != 0) - ec = rc; - if (fdo) - rc = Fclose(fdo); + + fi = fiNew(ts, NULL, h, RPMTAG_BASENAMES, scareMem); + if (fi != NULL) { + + if (qva->qva_flags & VERIFY_DEPS) { + if ((rc = verifyDependencies(qva, ts, h)) != 0) + ec = rc; + } + if (qva->qva_flags & VERIFY_FILES) { + if ((rc = verifyHeader(qva, ts, fi)) != 0) + ec = rc; + } + if ((qva->qva_flags & VERIFY_SCRIPT) + && headerIsEntry(h, RPMTAG_VERIFYSCRIPT)) + { + FD_t fdo = fdDup(STDOUT_FILENO); + if ((rc = rpmVerifyScript(qva, ts, fi, fdo)) != 0) + ec = rc; + if (fdo) + rc = Fclose(fdo); + } + + fi = fiFree(fi, 1); } + return ec; } diff --git a/po/cs.po b/po/cs.po index c303a1d..5cf6e0a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-03-09 14:38-0500\n" +"POT-Creation-Date: 2002-03-12 11:41-0500\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -832,7 +832,7 @@ msgstr "Nemohu p msgid "Could not open %s: %s\n" msgstr "Nemohu otevøít %s: %s\n" -#: build/pack.c:618 lib/psm.c:1444 +#: build/pack.c:618 lib/psm.c:1445 #, c-format msgid "Unable to write package: %s\n" msgstr "Nemohu zapsat balíèek: %s\n" @@ -862,7 +862,7 @@ msgstr "Nemohu p msgid "Unable to write payload to %s: %s\n" msgstr "Nemohu zapsat payload do %s: %s\n" -#: build/pack.c:699 lib/psm.c:1725 +#: build/pack.c:699 lib/psm.c:1726 #, c-format msgid "Wrote: %s\n" msgstr "Zapsáno: %s\n" @@ -1621,46 +1621,46 @@ msgstr "%s vytvo msgid "error creating temporary file %s\n" msgstr "chyba pøi vytváøení doèasného souboru %s\n" -#: lib/package.c:184 lib/package.c:260 +#: lib/package.c:181 lib/package.c:257 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "práce s balíèky verze 1 není podporována touto verzí RPM\n" -#: lib/package.c:205 lib/package.c:268 +#: lib/package.c:202 lib/package.c:265 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "tato verze RPM podporuje práci s balíèky s verzí <= 4\n" -#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557 +#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553 #, c-format msgid "%s: readLead failed\n" msgstr "%s: readLead selhalo\n" -#: lib/package.c:252 +#: lib/package.c:249 #, fuzzy, c-format msgid "%s: bad magic\n" msgstr "©patné magické èíslo" -#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573 +#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature selhalo\n" -#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578 +#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574 #, c-format msgid "%s: No signature available\n" msgstr "%s: Není dostupný ¾ádný podpis\n" -#: lib/package.c:331 lib/rpmchecksig.c:476 +#: lib/package.c:328 lib/rpmchecksig.c:474 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead selhalo\n" -#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651 +#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505 +#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread selhalo: %s\n" @@ -2212,36 +2212,36 @@ msgstr "proveden msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s-%s-%s obsahuje %d souborù, test = %d\n" -#: lib/psm.c:1351 +#: lib/psm.c:1352 #, fuzzy, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: scriptlet %s selhal (%d), pøeskakuji %s-%s-%s\n" -#: lib/psm.c:1493 +#: lib/psm.c:1494 #, c-format msgid "user %s does not exist - using root\n" msgstr "u¾ivatel %s neexistuje - pou¾it u¾ivatel root\n" -#: lib/psm.c:1502 +#: lib/psm.c:1503 #, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ita skupina root\n" -#: lib/psm.c:1544 +#: lib/psm.c:1545 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalování archívu selhalo %s%s: %s\n" -#: lib/psm.c:1545 +#: lib/psm.c:1546 msgid " on file " msgstr " na souboru " -#: lib/psm.c:1733 +#: lib/psm.c:1734 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nemohu otevøít %s: %s\n" -#: lib/psm.c:1736 +#: lib/psm.c:1737 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s selhalo\n" @@ -2378,12 +2378,12 @@ msgstr "z msgid "package %s is not installed\n" msgstr "balíèek %s není nainstalován\n" -#: lib/rpmal.c:674 +#: lib/rpmal.c:673 #, fuzzy msgid "(added files)" msgstr "¹patný db soubor %s\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:770 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s ANO (db poskytuje)\n" @@ -2402,57 +2402,57 @@ msgstr "makeTempFile selhalo\n" msgid "%s: Fwrite failed: %s\n" msgstr "%s: Fwrite selhalo: %s\n" -#: lib/rpmchecksig.c:169 +#: lib/rpmchecksig.c:170 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: RPM v1.0 nelze podepsat\n" -#: lib/rpmchecksig.c:173 +#: lib/rpmchecksig.c:174 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: Nemohu znovu podepsat RPM v2.0\n" -#: lib/rpmchecksig.c:253 +#: lib/rpmchecksig.c:254 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: writeLead selhalo: %s\n" -#: lib/rpmchecksig.c:259 +#: lib/rpmchecksig.c:260 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignature selhalo: %s\n" -#: lib/rpmchecksig.c:490 +#: lib/rpmchecksig.c:488 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead selhalo\n" -#: lib/rpmchecksig.c:563 +#: lib/rpmchecksig.c:559 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Není dostupný ¾ádný podpis (RPM v1.0)\n" -#: lib/rpmchecksig.c:810 +#: lib/rpmchecksig.c:804 msgid "NOT OK" msgstr "NENÍ OK" -#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825 +#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819 msgid " (MISSING KEYS:" msgstr " (CHYBÍ KLÍÈ:" -#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827 +#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828 +#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822 msgid " (UNTRUSTED KEYS:" msgstr " (NEDÙVÌRYHODNÝ KLÍÈ:" -#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830 +#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:824 +#: lib/rpmchecksig.c:818 msgid "OK" msgstr "OK" @@ -2664,182 +2664,171 @@ msgstr "Nemohu msgid "Unable to open %s for reading: %s.\n" msgstr "Nemohu otevøít %s pro ètení: %s.\n" -#: lib/signature.c:119 +#: lib/signature.c:118 msgid "file is not regular -- skipping size check\n" msgstr "není obyèejný soubor -- pøeskakuji kontrolu velikosti\n" -#: lib/signature.c:128 +#: lib/signature.c:127 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" "Pøedpokl. délka: %12d = hlavièka(%d)+signatura(%d)+výplò(%d)+data(%d)\n" -#: lib/signature.c:133 +#: lib/signature.c:132 #, c-format msgid " Actual size: %12d\n" msgstr "Aktuální délka: %12d\n" -#: lib/signature.c:153 +#: lib/signature.c:152 msgid "No signature\n" msgstr "Chybí podpis\n" -#: lib/signature.c:157 +#: lib/signature.c:156 msgid "Old PGP signature\n" msgstr "Starý PGP podpis\n" -#: lib/signature.c:170 +#: lib/signature.c:167 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "Starý (pouze interní) podpis! Jak jste to získali!?\n" -#: lib/signature.c:226 +#: lib/signature.c:221 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "Podpisu: velikost(%d)+vata(%d)\n" -#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678 -#: lib/signature.c:711 +#: lib/signature.c:300 lib/signature.c:397 lib/signature.c:664 +#: lib/signature.c:697 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Nemohu spustit %s: %s\n" -#: lib/signature.c:323 +#: lib/signature.c:316 msgid "pgp failed\n" msgstr "pgp selhalo\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:330 +#: lib/signature.c:323 msgid "pgp failed to write signature\n" msgstr "pgp selhalo pøi zápisu podpisu\n" -#: lib/signature.c:335 +#: lib/signature.c:328 #, c-format msgid "PGP sig size: %d\n" msgstr "Velikost podpisu PGP: %d\n" -#: lib/signature.c:351 lib/signature.c:451 +#: lib/signature.c:342 lib/signature.c:440 msgid "unable to read the signature\n" msgstr "nemohu èíst podpis\n" -#: lib/signature.c:356 +#: lib/signature.c:347 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "Pøeèteno %d bajtù PGP podpisu\n" -#: lib/signature.c:423 +#: lib/signature.c:414 msgid "gpg failed\n" msgstr "gpg selhalo\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:430 +#: lib/signature.c:421 msgid "gpg failed to write signature\n" msgstr "gpg selhalo pøi zápisu podpisu\n" -#: lib/signature.c:435 +#: lib/signature.c:426 #, c-format msgid "GPG sig size: %d\n" msgstr "Velikost GPG podpisu: %d\n" -#: lib/signature.c:456 +#: lib/signature.c:445 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "Pøeèteno %d bajtù GPG podpisu\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:716 lib/signature.c:771 +#: lib/signature.c:702 lib/signature.c:753 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "©patná %%_signature spec v souboru maker\n" -#: lib/signature.c:750 +#: lib/signature.c:732 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Musíte nastavit \"%%_gpg_name\" ve svém makro souboru\n" -#: lib/signature.c:763 +#: lib/signature.c:745 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Musíte nastavit \"%%_pgp_name\" ve svém makro souboru\n" -#: lib/signature.c:807 +#: lib/signature.c:789 #, fuzzy msgid "Header+Payload size: " msgstr "Velikost hlavièky je pøili¹ velká" -#: lib/signature.c:847 +#: lib/signature.c:825 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:906 +#: lib/signature.c:873 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1102 +#: lib/signature.c:1059 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "vynechat pøípadné MD5 souèty" -#: lib/signature.c:1221 +#: lib/signature.c:1168 msgid "Header " msgstr "" -#: lib/signature.c:1222 +#: lib/signature.c:1169 #, fuzzy msgid "V3 DSA signature: " msgstr "Chybí podpis\n" -#: lib/signature.c:1311 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1338 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1342 +#: lib/signature.c:1275 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Podpisu: velikost(%d)+vata(%d)\n" -#: lib/transaction.c:180 +#: lib/transaction.c:173 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s pøeskoèeno, proto¾e chybí pøíznak\n" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:985 #, c-format msgid "excluding directory %s\n" msgstr "vynechávám adresáø %s\n" -#: lib/transaction.c:1085 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "získávám seznam pøipojených systémù souborù\n" -#: lib/verify.c:243 -msgid "package lacks both user name and id lists (this should never happen)\n" -msgstr "" -"balíèek neobsahuje ani u¾ivatelská jména ani seznam id (nemìlo by se nikdy " -"stát)\n" - -#: lib/verify.c:264 -msgid "package lacks both group name and id lists (this should never happen)\n" -msgstr "" -"balíèek neobsahuje ani jména skupin ani seznam id (nemìlo by se nikdy stát)\n" - -#: lib/verify.c:408 +#: lib/verify.c:324 #, c-format msgid "missing %s" msgstr "chybí %s" -#: lib/verify.c:505 +#: lib/verify.c:419 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Nevyøe¹ené závislosti pro %s-%s-%s: " -#: lib/verify.c:543 +#: lib/verify.c:459 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "%s-%s-%s: kontrola digestu v hlavièce selhala\n" @@ -3435,6 +3424,18 @@ msgstr "url port mus msgid "failed to create %s: %s\n" msgstr "nemohu vytvoøit %s: %s\n" +#~ msgid "" +#~ "package lacks both user name and id lists (this should never happen)\n" +#~ msgstr "" +#~ "balíèek neobsahuje ani u¾ivatelská jména ani seznam id (nemìlo by se " +#~ "nikdy stát)\n" + +#~ msgid "" +#~ "package lacks both group name and id lists (this should never happen)\n" +#~ msgstr "" +#~ "balíèek neobsahuje ani jména skupin ani seznam id (nemìlo by se nikdy " +#~ "stát)\n" + #, fuzzy #~ msgid "sign a package, discarding all current signatures" #~ msgstr "podepsat balíèek (zahodit aktuální podpis)" diff --git a/po/da.po b/po/da.po index 00946d9..cb2b38c 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-03-09 14:38-0500\n" +"POT-Creation-Date: 2002-03-12 11:41-0500\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -829,7 +829,7 @@ msgstr "Kunne ikke l msgid "Could not open %s: %s\n" msgstr "Kunne ikke åbne %s: %s\n" -#: build/pack.c:618 lib/psm.c:1444 +#: build/pack.c:618 lib/psm.c:1445 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunne ikke skrive pakke: %s\n" @@ -859,7 +859,7 @@ msgstr "Kunne ikke l msgid "Unable to write payload to %s: %s\n" msgstr "Kunne ikke skrive pakkeindhold til %s: %s\n" -#: build/pack.c:699 lib/psm.c:1725 +#: build/pack.c:699 lib/psm.c:1726 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1620,47 +1620,47 @@ msgstr "%s oprettet som %s\n" msgid "error creating temporary file %s\n" msgstr "fejl ved oprettelse af midlertidig fil %s\n" -#: lib/package.c:184 lib/package.c:260 +#: lib/package.c:181 lib/package.c:257 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "indpakningsversion 1 understøttes ikke af denne udgave af RPM\n" -#: lib/package.c:205 lib/package.c:268 +#: lib/package.c:202 lib/package.c:265 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" "kun indpakninger med hovedversion <= 4 understøttes af denne udgave af RPM\n" -#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557 +#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553 #, c-format msgid "%s: readLead failed\n" msgstr "%s: readLead mislykkedes\n" -#: lib/package.c:252 +#: lib/package.c:249 #, fuzzy, c-format msgid "%s: bad magic\n" msgstr "Ugyldigt magisk tal" -#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573 +#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature mislykkedes\n" -#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578 +#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574 #, c-format msgid "%s: No signature available\n" msgstr "%s: Ingen tilgængelig signatur\n" -#: lib/package.c:331 lib/rpmchecksig.c:476 +#: lib/package.c:328 lib/rpmchecksig.c:474 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead mislykkedes\n" -#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651 +#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505 +#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread mislykkedes: %s\n" @@ -2230,36 +2230,36 @@ msgstr "" msgid "%s: %s has %d files, test = %d\n" msgstr "pakke: %s-%s-%s filer test = %d\n" -#: lib/psm.c:1351 +#: lib/psm.c:1352 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1494 #, c-format msgid "user %s does not exist - using root\n" msgstr "bruger %s eksisterer ikke - bruger root\n" -#: lib/psm.c:1502 +#: lib/psm.c:1503 #, c-format msgid "group %s does not exist - using root\n" msgstr "gruppe %s eksisterer ikke - bruger root\n" -#: lib/psm.c:1544 +#: lib/psm.c:1545 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "udpakning af arkiv mislykkedes%s%s: %s\n" -#: lib/psm.c:1545 +#: lib/psm.c:1546 msgid " on file " msgstr " for fil " -#: lib/psm.c:1733 +#: lib/psm.c:1734 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/psm.c:1736 +#: lib/psm.c:1737 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s mislykkedes\n" @@ -2396,12 +2396,12 @@ msgstr "post %d kunne ikke l msgid "package %s is not installed\n" msgstr "pakken %s er ikke installeret\n" -#: lib/rpmal.c:674 +#: lib/rpmal.c:673 #, fuzzy msgid "(added files)" msgstr "ugyldig db-fil %s\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:770 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s JA (db tilfører)\n" @@ -2420,57 +2420,57 @@ msgstr "makeTempFile mislykkedes\n" msgid "%s: Fwrite failed: %s\n" msgstr "%s: Fwrite mislykkedes: %s\n" -#: lib/rpmchecksig.c:169 +#: lib/rpmchecksig.c:170 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: Kan ikke underskrive v1.0 RPM\n" -#: lib/rpmchecksig.c:173 +#: lib/rpmchecksig.c:174 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: Kan ikke genunderskrive v2.0 RPM\n" -#: lib/rpmchecksig.c:253 +#: lib/rpmchecksig.c:254 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: writeLead mislykkedes: %s\n" -#: lib/rpmchecksig.c:259 +#: lib/rpmchecksig.c:260 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignature mislykkedes: %s\n" -#: lib/rpmchecksig.c:490 +#: lib/rpmchecksig.c:488 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead mislykkedes\n" -#: lib/rpmchecksig.c:563 +#: lib/rpmchecksig.c:559 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Ingen tilgængelig signatur (v1.0 RPM)\n" -#: lib/rpmchecksig.c:810 +#: lib/rpmchecksig.c:804 msgid "NOT OK" msgstr "IKKE O.K." -#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825 +#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819 msgid " (MISSING KEYS:" msgstr " (MANGLENDE NØGLER: " -#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827 +#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828 +#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822 msgid " (UNTRUSTED KEYS:" msgstr " (IKKE-BETROEDE NØGLER:" -#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830 +#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:824 +#: lib/rpmchecksig.c:818 msgid "OK" msgstr "O.K." @@ -2684,182 +2684,170 @@ msgstr "Kunne ikke l msgid "Unable to open %s for reading: %s.\n" msgstr "Kunne ikke åbne %s for læsning: %s.\n" -#: lib/signature.c:119 +#: lib/signature.c:118 msgid "file is not regular -- skipping size check\n" msgstr "filen er ikke regulær -- overspringer størrelsestjek\n" -#: lib/signature.c:128 +#: lib/signature.c:127 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "Forventet størrelse: %12d = indled(%d)+sign(%d)+fyld(%d)+data(%d)\n" -#: lib/signature.c:133 +#: lib/signature.c:132 #, c-format msgid " Actual size: %12d\n" msgstr " Faktisk størrelse: %12d\n" -#: lib/signature.c:153 +#: lib/signature.c:152 msgid "No signature\n" msgstr "Ingen signatur\n" -#: lib/signature.c:157 +#: lib/signature.c:156 msgid "Old PGP signature\n" msgstr "Gammel PGP-signatur\n" -#: lib/signature.c:170 +#: lib/signature.c:167 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "Gammel (internt brug) signatur! Hvordan fik du fingre i den!?\n" -#: lib/signature.c:226 +#: lib/signature.c:221 #, fuzzy, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "Signaturstørrelse: %d\n" -#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678 -#: lib/signature.c:711 +#: lib/signature.c:300 lib/signature.c:397 lib/signature.c:664 +#: lib/signature.c:697 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Kunne ikke udføre %s: %s\n" -#: lib/signature.c:323 +#: lib/signature.c:316 msgid "pgp failed\n" msgstr "pgp fejlede\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:330 +#: lib/signature.c:323 msgid "pgp failed to write signature\n" msgstr "pgp kunne ikke skrive signatur\n" -#: lib/signature.c:335 +#: lib/signature.c:328 #, c-format msgid "PGP sig size: %d\n" msgstr "PGP-signaturstørrelse: %d\n" -#: lib/signature.c:351 lib/signature.c:451 +#: lib/signature.c:342 lib/signature.c:440 msgid "unable to read the signature\n" msgstr "kunne ikke læse signaturen\n" -#: lib/signature.c:356 +#: lib/signature.c:347 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "Fik %d byte af PGP-signatur\n" -#: lib/signature.c:423 +#: lib/signature.c:414 msgid "gpg failed\n" msgstr "gpg fejlede\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:430 +#: lib/signature.c:421 msgid "gpg failed to write signature\n" msgstr "gpg kunne ikke skrive signaturen\n" -#: lib/signature.c:435 +#: lib/signature.c:426 #, c-format msgid "GPG sig size: %d\n" msgstr "GPG-signaturstørrelse: %d\n" -#: lib/signature.c:456 +#: lib/signature.c:445 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "Fik %d byte GPG-signatur\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:716 lib/signature.c:771 +#: lib/signature.c:702 lib/signature.c:753 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "Ugyldig angivelse af '%%_signature'-spec i makrofil.\n" -#: lib/signature.c:750 +#: lib/signature.c:732 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Du skal angive \"%%_gpg_name\" i din makrofil\n" -#: lib/signature.c:763 +#: lib/signature.c:745 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Du skal angive \"%%_pgp_name\" i din makrofil\n" -#: lib/signature.c:807 +#: lib/signature.c:789 #, fuzzy msgid "Header+Payload size: " msgstr "Hovedstørrelse er for stor" -#: lib/signature.c:847 +#: lib/signature.c:825 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:906 +#: lib/signature.c:873 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1102 +#: lib/signature.c:1059 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "overspring eventuelle MD5-signaturer" -#: lib/signature.c:1221 +#: lib/signature.c:1168 msgid "Header " msgstr "" -#: lib/signature.c:1222 +#: lib/signature.c:1169 #, fuzzy msgid "V3 DSA signature: " msgstr "Ingen signatur\n" -#: lib/signature.c:1311 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1338 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1342 +#: lib/signature.c:1275 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Signaturfyld : %d\n" -#: lib/transaction.c:180 +#: lib/transaction.c:173 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s oversprunget grundet manglende ok-flag\n" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:985 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer kataloget %s\n" -#: lib/transaction.c:1085 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "henter liste over monterede filsystemer\n" -#: lib/verify.c:243 -msgid "package lacks both user name and id lists (this should never happen)\n" -msgstr "" -"pakken har hverken en liste over brugernavne eller id (det burde ikke kunne " -"ske)\n" - -#: lib/verify.c:264 -msgid "package lacks both group name and id lists (this should never happen)\n" -msgstr "" -"pakken har hverken en liste over gruppenavne eller id (det burde ikke kunne " -"ske)\n" - -#: lib/verify.c:408 +#: lib/verify.c:324 #, c-format msgid "missing %s" msgstr "manglende %s" -#: lib/verify.c:505 +#: lib/verify.c:419 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Ikke-tilfredsstillede afhængighedskrav for %s-%s-%s: " -#: lib/verify.c:543 +#: lib/verify.c:459 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3461,6 +3449,18 @@ msgstr "url-port skal v msgid "failed to create %s: %s\n" msgstr "kunne ikke oprette %s: %s\n" +#~ msgid "" +#~ "package lacks both user name and id lists (this should never happen)\n" +#~ msgstr "" +#~ "pakken har hverken en liste over brugernavne eller id (det burde ikke " +#~ "kunne ske)\n" + +#~ msgid "" +#~ "package lacks both group name and id lists (this should never happen)\n" +#~ msgstr "" +#~ "pakken har hverken en liste over gruppenavne eller id (det burde ikke " +#~ "kunne ske)\n" + #, fuzzy #~ msgid "========== Header RSA signature\n" #~ msgstr "========== tsort'er pakker\n" diff --git a/po/de.po b/po/de.po index b6ec1d2..4e4f39c 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-03-09 14:38-0500\n" +"POT-Creation-Date: 2002-03-12 11:41-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -921,7 +921,7 @@ msgid "Could not open %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen\n" # , c-format -#: build/pack.c:618 lib/psm.c:1444 +#: build/pack.c:618 lib/psm.c:1445 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nicht möglich %s zu schreiben" @@ -956,7 +956,7 @@ msgstr "Nicht m msgid "Unable to write payload to %s: %s\n" msgstr "Nicht möglich %s zu schreiben" -#: build/pack.c:699 lib/psm.c:1725 +#: build/pack.c:699 lib/psm.c:1726 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1759,50 +1759,50 @@ msgstr "kann Datei %s nicht msgid "error creating temporary file %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/package.c:184 lib/package.c:260 +#: lib/package.c:181 lib/package.c:257 #, fuzzy msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" "Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt" -#: lib/package.c:205 lib/package.c:268 +#: lib/package.c:202 lib/package.c:265 #, fuzzy msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" "Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt" -#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557 +#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553 #, c-format msgid "%s: readLead failed\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/package.c:252 +#: lib/package.c:249 #, c-format msgid "%s: bad magic\n" msgstr "" -#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573 +#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: »rpmReadSignature« fehlgeschlagen\n" -#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578 +#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574 #, c-format msgid "%s: No signature available\n" msgstr "%s: Keine Signatur verfügbar\n" -#: lib/package.c:331 lib/rpmchecksig.c:476 +#: lib/package.c:328 lib/rpmchecksig.c:474 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651 +#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505 +#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: »readLead« fehlgeschlagen\n" @@ -2398,37 +2398,37 @@ msgstr "Ausf msgid "%s: %s has %d files, test = %d\n" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/psm.c:1351 +#: lib/psm.c:1352 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1494 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1502 +#: lib/psm.c:1503 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/psm.c:1544 +#: lib/psm.c:1545 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/psm.c:1545 +#: lib/psm.c:1546 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:1733 +#: lib/psm.c:1734 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/psm.c:1736 +#: lib/psm.c:1737 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp fehlgeschlagen" @@ -2572,12 +2572,12 @@ msgid "package %s is not installed\n" msgstr "Paket %s ist nicht installiert\n" # , c-format -#: lib/rpmal.c:674 +#: lib/rpmal.c:673 #, fuzzy msgid "(added files)" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/rpmal.c:771 +#: lib/rpmal.c:770 #, fuzzy msgid "(added provide)" msgstr "die Datei »%s« gehört zu keinem Paket\n" @@ -2597,58 +2597,58 @@ msgstr "%s: msgid "%s: Fwrite failed: %s\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/rpmchecksig.c:169 +#: lib/rpmchecksig.c:170 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: Kann v1.0-RPM nicht signieren\n" -#: lib/rpmchecksig.c:173 +#: lib/rpmchecksig.c:174 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: Kann v2.0-RPM nicht erneuert signieren\n" -#: lib/rpmchecksig.c:253 +#: lib/rpmchecksig.c:254 #, fuzzy, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/rpmchecksig.c:259 +#: lib/rpmchecksig.c:260 #, fuzzy, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: »rpmReadSignature« fehlgeschlagen\n" -#: lib/rpmchecksig.c:490 +#: lib/rpmchecksig.c:488 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/rpmchecksig.c:563 +#: lib/rpmchecksig.c:559 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Keine Signatur verfügbar (v1.0 RPM)\n" -#: lib/rpmchecksig.c:810 +#: lib/rpmchecksig.c:804 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825 +#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819 #, fuzzy msgid " (MISSING KEYS:" msgstr " (FEHLENDE SCHLüSSEL)" -#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827 +#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821 msgid ") " msgstr "" -#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828 +#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830 +#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824 msgid ")" msgstr "" -#: lib/rpmchecksig.c:824 +#: lib/rpmchecksig.c:818 msgid "OK" msgstr "" @@ -2865,185 +2865,177 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s." -#: lib/signature.c:119 +#: lib/signature.c:118 msgid "file is not regular -- skipping size check\n" msgstr "" -#: lib/signature.c:128 +#: lib/signature.c:127 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:133 +#: lib/signature.c:132 #, c-format msgid " Actual size: %12d\n" msgstr "" -#: lib/signature.c:153 +#: lib/signature.c:152 #, fuzzy msgid "No signature\n" msgstr "%s: Keine Signatur verfügbar\n" -#: lib/signature.c:157 +#: lib/signature.c:156 #, fuzzy msgid "Old PGP signature\n" msgstr "PGP-Signatur generieren" -#: lib/signature.c:170 +#: lib/signature.c:167 #, fuzzy msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "Alte Signatur (nur intern)! Wie bist du daran gekommen!?" -#: lib/signature.c:226 +#: lib/signature.c:221 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "" -#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678 -#: lib/signature.c:711 +#: lib/signature.c:300 lib/signature.c:397 lib/signature.c:664 +#: lib/signature.c:697 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Konnte pgp nicht durchführen" -#: lib/signature.c:323 +#: lib/signature.c:316 #, fuzzy msgid "pgp failed\n" msgstr "pgp fehlgeschlagen" #. PGP failed to write signature #. Just in case -#: lib/signature.c:330 +#: lib/signature.c:323 #, fuzzy msgid "pgp failed to write signature\n" msgstr "pgp fehlgeschlagen beim Schreiben der Signatur" -#: lib/signature.c:335 +#: lib/signature.c:328 #, c-format msgid "PGP sig size: %d\n" msgstr "" -#: lib/signature.c:351 lib/signature.c:451 +#: lib/signature.c:342 lib/signature.c:440 #, fuzzy msgid "unable to read the signature\n" msgstr "nicht möglich, die Signatur zu lesen" -#: lib/signature.c:356 +#: lib/signature.c:347 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:423 +#: lib/signature.c:414 #, fuzzy msgid "gpg failed\n" msgstr "pgp fehlgeschlagen" #. GPG failed to write signature #. Just in case -#: lib/signature.c:430 +#: lib/signature.c:421 #, fuzzy msgid "gpg failed to write signature\n" msgstr "pgp fehlgeschlagen beim Schreiben der Signatur" -#: lib/signature.c:435 +#: lib/signature.c:426 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:456 +#: lib/signature.c:445 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:716 lib/signature.c:771 +#: lib/signature.c:702 lib/signature.c:753 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:750 +#: lib/signature.c:732 #, fuzzy, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein" -#: lib/signature.c:763 +#: lib/signature.c:745 #, fuzzy, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein" -#: lib/signature.c:807 +#: lib/signature.c:789 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:847 +#: lib/signature.c:825 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:906 +#: lib/signature.c:873 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1102 +#: lib/signature.c:1059 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "alle MD5-Signaturen überspringen" -#: lib/signature.c:1221 +#: lib/signature.c:1168 msgid "Header " msgstr "" -#: lib/signature.c:1222 +#: lib/signature.c:1169 #, fuzzy msgid "V3 DSA signature: " msgstr "%s: Keine Signatur verfügbar\n" -#: lib/signature.c:1311 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1338 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1342 +#: lib/signature.c:1275 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:180 +#: lib/transaction.c:173 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:985 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/transaction.c:1085 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:243 -msgid "package lacks both user name and id lists (this should never happen)\n" -msgstr "" - -#: lib/verify.c:264 -msgid "package lacks both group name and id lists (this should never happen)\n" -msgstr "" - -#: lib/verify.c:408 +#: lib/verify.c:324 #, fuzzy, c-format msgid "missing %s" msgstr "fehlende { nach %{" -#: lib/verify.c:505 +#: lib/verify.c:419 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: " -#: lib/verify.c:543 +#: lib/verify.c:459 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/fi.po b/po/fi.po index 2cf6f00..a50484a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-03-09 14:38-0500\n" +"POT-Creation-Date: 2002-03-12 11:41-0500\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -835,7 +835,7 @@ msgstr "%s:n kirjoitus ei onnistu" msgid "Could not open %s: %s\n" msgstr "%s:n avaus epäonnistui\n" -#: build/pack.c:618 lib/psm.c:1444 +#: build/pack.c:618 lib/psm.c:1445 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "%s:n kirjoitus ei onnistu" @@ -865,7 +865,7 @@ msgstr "%s:n kirjoitus ei onnistu" msgid "Unable to write payload to %s: %s\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:699 lib/psm.c:1725 +#: build/pack.c:699 lib/psm.c:1726 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1636,48 +1636,48 @@ msgstr "en voinut avata tiedostoa %s: " msgid "error creating temporary file %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/package.c:184 lib/package.c:260 +#: lib/package.c:181 lib/package.c:257 #, fuzzy msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja" -#: lib/package.c:205 lib/package.c:268 +#: lib/package.c:202 lib/package.c:265 #, fuzzy msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja" -#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557 +#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553 #, c-format msgid "%s: readLead failed\n" msgstr "%s: readLead epäonnistui\n" -#: lib/package.c:252 +#: lib/package.c:249 #, c-format msgid "%s: bad magic\n" msgstr "" -#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573 +#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature epäonnistui\n" -#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578 +#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574 #, c-format msgid "%s: No signature available\n" msgstr "%s: Ei allekirjoitusta saatavilla\n" -#: lib/package.c:331 lib/rpmchecksig.c:476 +#: lib/package.c:328 lib/rpmchecksig.c:474 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead epäonnistui\n" -#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651 +#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505 +#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: readLead epäonnistui\n" @@ -2260,36 +2260,36 @@ msgstr "skriptin ajo ep msgid "%s: %s has %d files, test = %d\n" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/psm.c:1351 +#: lib/psm.c:1352 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1494 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1502 +#: lib/psm.c:1503 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/psm.c:1544 +#: lib/psm.c:1545 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/psm.c:1545 +#: lib/psm.c:1546 msgid " on file " msgstr "" -#: lib/psm.c:1733 +#: lib/psm.c:1734 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/psm.c:1736 +#: lib/psm.c:1737 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp epäonnistui" @@ -2429,12 +2429,12 @@ msgstr "tietuetta %d ei voitu lukea\n" msgid "package %s is not installed\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/rpmal.c:674 +#: lib/rpmal.c:673 #, fuzzy msgid "(added files)" msgstr "en voinut avata %s: %s" -#: lib/rpmal.c:771 +#: lib/rpmal.c:770 #, fuzzy msgid "(added provide)" msgstr "tiedostoa %s ei omista mikään paketti\n" @@ -2454,58 +2454,58 @@ msgstr "%s: avaus ei onnistunut\n" msgid "%s: Fwrite failed: %s\n" msgstr "%s: readLead epäonnistui\n" -#: lib/rpmchecksig.c:169 +#: lib/rpmchecksig.c:170 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: En voi allekirjoittaa v1.0 RPM:ää\n" -#: lib/rpmchecksig.c:173 +#: lib/rpmchecksig.c:174 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: En voi uudelleen allekirjoittaa v2.0 RPM:ää\n" -#: lib/rpmchecksig.c:253 +#: lib/rpmchecksig.c:254 #, fuzzy, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: readLead epäonnistui\n" -#: lib/rpmchecksig.c:259 +#: lib/rpmchecksig.c:260 #, fuzzy, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmReadSignature epäonnistui\n" -#: lib/rpmchecksig.c:490 +#: lib/rpmchecksig.c:488 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead epäonnistui\n" -#: lib/rpmchecksig.c:563 +#: lib/rpmchecksig.c:559 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Ei allekirjoitusta saatavilla (v1.0 RPM)\n" -#: lib/rpmchecksig.c:810 +#: lib/rpmchecksig.c:804 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825 +#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819 #, fuzzy msgid " (MISSING KEYS:" msgstr "(PUUTTUVAT AVAIMET)" -#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827 +#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821 msgid ") " msgstr "" -#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828 +#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830 +#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824 msgid ")" msgstr "" -#: lib/rpmchecksig.c:824 +#: lib/rpmchecksig.c:818 msgid "OK" msgstr "" @@ -2717,185 +2717,177 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "En voi avata %s luettavaksi: %s." -#: lib/signature.c:119 +#: lib/signature.c:118 msgid "file is not regular -- skipping size check\n" msgstr "" -#: lib/signature.c:128 +#: lib/signature.c:127 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:133 +#: lib/signature.c:132 #, c-format msgid " Actual size: %12d\n" msgstr "" -#: lib/signature.c:153 +#: lib/signature.c:152 #, fuzzy msgid "No signature\n" msgstr "%s: Ei allekirjoitusta saatavilla\n" -#: lib/signature.c:157 +#: lib/signature.c:156 #, fuzzy msgid "Old PGP signature\n" msgstr "generoi PGP-allekirjoitus" -#: lib/signature.c:170 +#: lib/signature.c:167 #, fuzzy msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "Vanha (sisäisen käytön) allekirjoitus! Mistä sait sen!?" -#: lib/signature.c:226 +#: lib/signature.c:221 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "" -#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678 -#: lib/signature.c:711 +#: lib/signature.c:300 lib/signature.c:397 lib/signature.c:664 +#: lib/signature.c:697 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "En voinut ajaa pgp:tä" -#: lib/signature.c:323 +#: lib/signature.c:316 #, fuzzy msgid "pgp failed\n" msgstr "pgp epäonnistui" #. PGP failed to write signature #. Just in case -#: lib/signature.c:330 +#: lib/signature.c:323 #, fuzzy msgid "pgp failed to write signature\n" msgstr "pgp ei voinut kirjoittaa allekirjoitusta" -#: lib/signature.c:335 +#: lib/signature.c:328 #, c-format msgid "PGP sig size: %d\n" msgstr "" -#: lib/signature.c:351 lib/signature.c:451 +#: lib/signature.c:342 lib/signature.c:440 #, fuzzy msgid "unable to read the signature\n" msgstr "en voinut lukea allekirjoitusta" -#: lib/signature.c:356 +#: lib/signature.c:347 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:423 +#: lib/signature.c:414 #, fuzzy msgid "gpg failed\n" msgstr "pgp epäonnistui" #. GPG failed to write signature #. Just in case -#: lib/signature.c:430 +#: lib/signature.c:421 #, fuzzy msgid "gpg failed to write signature\n" msgstr "pgp ei voinut kirjoittaa allekirjoitusta" -#: lib/signature.c:435 +#: lib/signature.c:426 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:456 +#: lib/signature.c:445 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:716 lib/signature.c:771 +#: lib/signature.c:702 lib/signature.c:753 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:750 +#: lib/signature.c:732 #, fuzzy, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa" -#: lib/signature.c:763 +#: lib/signature.c:745 #, fuzzy, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa" -#: lib/signature.c:807 +#: lib/signature.c:789 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:847 +#: lib/signature.c:825 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:906 +#: lib/signature.c:873 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1102 +#: lib/signature.c:1059 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "ohita MD5-allekirjoitukset" -#: lib/signature.c:1221 +#: lib/signature.c:1168 msgid "Header " msgstr "" -#: lib/signature.c:1222 +#: lib/signature.c:1169 #, fuzzy msgid "V3 DSA signature: " msgstr "%s: Ei allekirjoitusta saatavilla\n" -#: lib/signature.c:1311 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1338 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1342 +#: lib/signature.c:1275 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:180 +#: lib/transaction.c:173 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:985 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/transaction.c:1085 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:243 -msgid "package lacks both user name and id lists (this should never happen)\n" -msgstr "" - -#: lib/verify.c:264 -msgid "package lacks both group name and id lists (this should never happen)\n" -msgstr "" - -#: lib/verify.c:408 +#: lib/verify.c:324 #, fuzzy, c-format msgid "missing %s" msgstr "puuttuva '{' '%':n jälkeen" -#: lib/verify.c:505 +#: lib/verify.c:419 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:" -#: lib/verify.c:543 +#: lib/verify.c:459 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/fr.po b/po/fr.po index 81ec52c..273f76a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-03-09 14:38-0500\n" +"POT-Creation-Date: 2002-03-12 11:41-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -870,7 +870,7 @@ msgstr "impossible d'ouvrir: %s\n" msgid "Could not open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:618 lib/psm.c:1444 +#: build/pack.c:618 lib/psm.c:1445 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -900,7 +900,7 @@ msgstr "impossible d'ouvrir: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:699 lib/psm.c:1725 +#: build/pack.c:699 lib/psm.c:1726 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1671,46 +1671,46 @@ msgstr "impossible d'ouvrir: %s\n" msgid "error creating temporary file %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/package.c:184 lib/package.c:260 +#: lib/package.c:181 lib/package.c:257 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" -#: lib/package.c:205 lib/package.c:268 +#: lib/package.c:202 lib/package.c:265 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" -#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557 +#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553 #, c-format msgid "%s: readLead failed\n" msgstr "" -#: lib/package.c:252 +#: lib/package.c:249 #, c-format msgid "%s: bad magic\n" msgstr "" -#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573 +#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "" -#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578 +#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574 #, c-format msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:331 lib/rpmchecksig.c:476 +#: lib/package.c:328 lib/rpmchecksig.c:474 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651 +#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505 +#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -2312,36 +2312,36 @@ msgstr "" msgid "%s: %s has %d files, test = %d\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/psm.c:1351 +#: lib/psm.c:1352 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1494 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1502 +#: lib/psm.c:1503 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1544 +#: lib/psm.c:1545 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "La construction a chou.\n" -#: lib/psm.c:1545 +#: lib/psm.c:1546 msgid " on file " msgstr "" -#: lib/psm.c:1733 +#: lib/psm.c:1734 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:1736 +#: lib/psm.c:1737 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "La construction a chou.\n" @@ -2481,12 +2481,12 @@ msgstr "" msgid "package %s is not installed\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpmal.c:674 +#: lib/rpmal.c:673 #, fuzzy msgid "(added files)" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:770 msgid "(added provide)" msgstr "" @@ -2505,57 +2505,57 @@ msgstr "La construction a chou.\n" msgid "%s: Fwrite failed: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmchecksig.c:169 +#: lib/rpmchecksig.c:170 #, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "" -#: lib/rpmchecksig.c:173 +#: lib/rpmchecksig.c:174 #, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "" -#: lib/rpmchecksig.c:253 +#: lib/rpmchecksig.c:254 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:259 +#: lib/rpmchecksig.c:260 #, fuzzy, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmchecksig.c:490 +#: lib/rpmchecksig.c:488 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmchecksig.c:563 +#: lib/rpmchecksig.c:559 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "" -#: lib/rpmchecksig.c:810 +#: lib/rpmchecksig.c:804 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825 +#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827 +#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821 msgid ") " msgstr "" -#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828 +#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830 +#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824 msgid ")" msgstr "" -#: lib/rpmchecksig.c:824 +#: lib/rpmchecksig.c:818 msgid "OK" msgstr "" @@ -2766,182 +2766,174 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/signature.c:119 +#: lib/signature.c:118 msgid "file is not regular -- skipping size check\n" msgstr "" -#: lib/signature.c:128 +#: lib/signature.c:127 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:133 +#: lib/signature.c:132 #, c-format msgid " Actual size: %12d\n" msgstr "" -#: lib/signature.c:153 +#: lib/signature.c:152 msgid "No signature\n" msgstr "" -#: lib/signature.c:157 +#: lib/signature.c:156 #, fuzzy msgid "Old PGP signature\n" msgstr " --sign - genre une signature PGP" -#: lib/signature.c:170 +#: lib/signature.c:167 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "" -#: lib/signature.c:226 +#: lib/signature.c:221 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "" -#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678 -#: lib/signature.c:711 +#: lib/signature.c:300 lib/signature.c:397 lib/signature.c:664 +#: lib/signature.c:697 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/signature.c:323 +#: lib/signature.c:316 #, fuzzy msgid "pgp failed\n" msgstr "La construction a chou.\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:330 +#: lib/signature.c:323 #, fuzzy msgid "pgp failed to write signature\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/signature.c:335 +#: lib/signature.c:328 #, c-format msgid "PGP sig size: %d\n" msgstr "" -#: lib/signature.c:351 lib/signature.c:451 +#: lib/signature.c:342 lib/signature.c:440 #, fuzzy msgid "unable to read the signature\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/signature.c:356 +#: lib/signature.c:347 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:423 +#: lib/signature.c:414 #, fuzzy msgid "gpg failed\n" msgstr "La construction a chou.\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:430 +#: lib/signature.c:421 #, fuzzy msgid "gpg failed to write signature\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/signature.c:435 +#: lib/signature.c:426 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:456 +#: lib/signature.c:445 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:716 lib/signature.c:771 +#: lib/signature.c:702 lib/signature.c:753 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:750 +#: lib/signature.c:732 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:763 +#: lib/signature.c:745 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/signature.c:807 +#: lib/signature.c:789 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:847 +#: lib/signature.c:825 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:906 +#: lib/signature.c:873 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1102 +#: lib/signature.c:1059 msgid "V3 RSA/MD5 signature: " msgstr "" -#: lib/signature.c:1221 +#: lib/signature.c:1168 msgid "Header " msgstr "" -#: lib/signature.c:1222 +#: lib/signature.c:1169 #, fuzzy msgid "V3 DSA signature: " msgstr " --sign - genre une signature PGP" -#: lib/signature.c:1311 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1338 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1342 +#: lib/signature.c:1275 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:180 +#: lib/transaction.c:173 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:985 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1085 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:243 -msgid "package lacks both user name and id lists (this should never happen)\n" -msgstr "" - -#: lib/verify.c:264 -msgid "package lacks both group name and id lists (this should never happen)\n" -msgstr "" - -#: lib/verify.c:408 +#: lib/verify.c:324 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:505 +#: lib/verify.c:419 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "impossible d'ouvrir: %s\n" -#: lib/verify.c:543 +#: lib/verify.c:459 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/gl.po b/po/gl.po index ed2c835..6f2225e 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2002-03-09 14:38-0500\n" +"POT-Creation-Date: 2002-03-12 11:41-0500\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -810,7 +810,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:618 lib/psm.c:1444 +#: build/pack.c:618 lib/psm.c:1445 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -840,7 +840,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:699 lib/psm.c:1725 +#: build/pack.c:699 lib/psm.c:1726 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1582,46 +1582,46 @@ msgstr "" msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:184 lib/package.c:260 +#: lib/package.c:181 lib/package.c:257 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" -#: lib/package.c:205 lib/package.c:268 +#: lib/package.c:202 lib/package.c:265 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" -#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557 +#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553 #, c-format msgid "%s: readLead failed\n" msgstr "" -#: lib/package.c:252 +#: lib/package.c:249 #, c-format msgid "%s: bad magic\n" msgstr "" -#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573 +#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "" -#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578 +#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574 #, c-format msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:331 lib/rpmchecksig.c:476 +#: lib/package.c:328 lib/rpmchecksig.c:474 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651 +#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505 +#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" @@ -2151,36 +2151,36 @@ msgstr "" msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1351 +#: lib/psm.c:1352 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1494 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1502 +#: lib/psm.c:1503 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1544 +#: lib/psm.c:1545 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1545 +#: lib/psm.c:1546 msgid " on file " msgstr "" -#: lib/psm.c:1733 +#: lib/psm.c:1734 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1736 +#: lib/psm.c:1737 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2317,11 +2317,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:674 +#: lib/rpmal.c:673 msgid "(added files)" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:770 msgid "(added provide)" msgstr "" @@ -2339,57 +2339,57 @@ msgstr "" msgid "%s: Fwrite failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:169 +#: lib/rpmchecksig.c:170 #, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "" -#: lib/rpmchecksig.c:173 +#: lib/rpmchecksig.c:174 #, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "" -#: lib/rpmchecksig.c:253 +#: lib/rpmchecksig.c:254 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:259 +#: lib/rpmchecksig.c:260 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:490 +#: lib/rpmchecksig.c:488 #, c-format msgid "%s: headerGetEntry failed\n" msgstr "" -#: lib/rpmchecksig.c:563 +#: lib/rpmchecksig.c:559 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "" -#: lib/rpmchecksig.c:810 +#: lib/rpmchecksig.c:804 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825 +#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827 +#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821 msgid ") " msgstr "" -#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828 +#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830 +#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824 msgid ")" msgstr "" -#: lib/rpmchecksig.c:824 +#: lib/rpmchecksig.c:818 msgid "OK" msgstr "" @@ -2599,175 +2599,167 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "" -#: lib/signature.c:119 +#: lib/signature.c:118 msgid "file is not regular -- skipping size check\n" msgstr "" -#: lib/signature.c:128 +#: lib/signature.c:127 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:133 +#: lib/signature.c:132 #, c-format msgid " Actual size: %12d\n" msgstr "" -#: lib/signature.c:153 +#: lib/signature.c:152 msgid "No signature\n" msgstr "" -#: lib/signature.c:157 +#: lib/signature.c:156 msgid "Old PGP signature\n" msgstr "" -#: lib/signature.c:170 +#: lib/signature.c:167 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "" -#: lib/signature.c:226 +#: lib/signature.c:221 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "" -#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678 -#: lib/signature.c:711 +#: lib/signature.c:300 lib/signature.c:397 lib/signature.c:664 +#: lib/signature.c:697 #, c-format msgid "Could not exec %s: %s\n" msgstr "" -#: lib/signature.c:323 +#: lib/signature.c:316 msgid "pgp failed\n" msgstr "" #. PGP failed to write signature #. Just in case -#: lib/signature.c:330 +#: lib/signature.c:323 msgid "pgp failed to write signature\n" msgstr "" -#: lib/signature.c:335 +#: lib/signature.c:328 #, c-format msgid "PGP sig size: %d\n" msgstr "" -#: lib/signature.c:351 lib/signature.c:451 +#: lib/signature.c:342 lib/signature.c:440 msgid "unable to read the signature\n" msgstr "" -#: lib/signature.c:356 +#: lib/signature.c:347 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:423 +#: lib/signature.c:414 msgid "gpg failed\n" msgstr "" #. GPG failed to write signature #. Just in case -#: lib/signature.c:430 +#: lib/signature.c:421 msgid "gpg failed to write signature\n" msgstr "" -#: lib/signature.c:435 +#: lib/signature.c:426 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:456 +#: lib/signature.c:445 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:716 lib/signature.c:771 +#: lib/signature.c:702 lib/signature.c:753 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:750 +#: lib/signature.c:732 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:763 +#: lib/signature.c:745 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/signature.c:807 +#: lib/signature.c:789 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:847 +#: lib/signature.c:825 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:906 +#: lib/signature.c:873 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1102 +#: lib/signature.c:1059 msgid "V3 RSA/MD5 signature: " msgstr "" -#: lib/signature.c:1221 +#: lib/signature.c:1168 msgid "Header " msgstr "" -#: lib/signature.c:1222 +#: lib/signature.c:1169 msgid "V3 DSA signature: " msgstr "" -#: lib/signature.c:1311 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1338 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1342 +#: lib/signature.c:1275 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:180 +#: lib/transaction.c:173 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:985 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1085 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:243 -msgid "package lacks both user name and id lists (this should never happen)\n" -msgstr "" - -#: lib/verify.c:264 -msgid "package lacks both group name and id lists (this should never happen)\n" -msgstr "" - -#: lib/verify.c:408 +#: lib/verify.c:324 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:505 +#: lib/verify.c:419 #, c-format msgid "Unsatisifed dependencies for %s: " msgstr "" -#: lib/verify.c:543 +#: lib/verify.c:459 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/is.po b/po/is.po index f7793bf..fbdde96 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-03-09 14:38-0500\n" +"POT-Creation-Date: 2002-03-12 11:41-0500\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -815,7 +815,7 @@ msgstr "Get ekki lesi msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:618 lib/psm.c:1444 +#: build/pack.c:618 lib/psm.c:1445 #, c-format msgid "Unable to write package: %s\n" msgstr "Get ekki ritað í pakka: %s\n" @@ -845,7 +845,7 @@ msgstr "Get ekki lesi msgid "Unable to write payload to %s: %s\n" msgstr "Get ekki ritað innihald í %s: %s\n" -#: build/pack.c:699 lib/psm.c:1725 +#: build/pack.c:699 lib/psm.c:1726 #, c-format msgid "Wrote: %s\n" msgstr "Skrifaði: %s\n" @@ -1589,46 +1589,46 @@ msgstr "%s b msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:184 lib/package.c:260 +#: lib/package.c:181 lib/package.c:257 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" -#: lib/package.c:205 lib/package.c:268 +#: lib/package.c:202 lib/package.c:265 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" -#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557 +#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553 #, c-format msgid "%s: readLead failed\n" msgstr "" -#: lib/package.c:252 +#: lib/package.c:249 #, c-format msgid "%s: bad magic\n" msgstr "" -#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573 +#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "" -#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578 +#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574 #, c-format msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:331 lib/rpmchecksig.c:476 +#: lib/package.c:328 lib/rpmchecksig.c:474 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: Fseek brást: %s\n" -#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651 +#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505 +#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" @@ -2167,36 +2167,36 @@ msgstr "" msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1351 +#: lib/psm.c:1352 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1494 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1502 +#: lib/psm.c:1503 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1544 +#: lib/psm.c:1545 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1545 +#: lib/psm.c:1546 msgid " on file " msgstr "" -#: lib/psm.c:1733 +#: lib/psm.c:1734 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "gat ekki opnað %s: %s\n" -#: lib/psm.c:1736 +#: lib/psm.c:1737 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s brást\n" @@ -2333,11 +2333,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:674 +#: lib/rpmal.c:673 msgid "(added files)" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:770 msgid "(added provide)" msgstr "" @@ -2355,57 +2355,57 @@ msgstr "" msgid "%s: Fwrite failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:169 +#: lib/rpmchecksig.c:170 #, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "" -#: lib/rpmchecksig.c:173 +#: lib/rpmchecksig.c:174 #, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "" -#: lib/rpmchecksig.c:253 +#: lib/rpmchecksig.c:254 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:259 +#: lib/rpmchecksig.c:260 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:490 +#: lib/rpmchecksig.c:488 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: Fseek brást: %s\n" -#: lib/rpmchecksig.c:563 +#: lib/rpmchecksig.c:559 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "" -#: lib/rpmchecksig.c:810 +#: lib/rpmchecksig.c:804 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825 +#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827 +#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821 msgid ") " msgstr "" -#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828 +#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830 +#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824 msgid ")" msgstr "" -#: lib/rpmchecksig.c:824 +#: lib/rpmchecksig.c:818 msgid "OK" msgstr "" @@ -2615,175 +2615,167 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Get ekki opnað %s til lesturs: %s.\n" -#: lib/signature.c:119 +#: lib/signature.c:118 msgid "file is not regular -- skipping size check\n" msgstr "" -#: lib/signature.c:128 +#: lib/signature.c:127 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:133 +#: lib/signature.c:132 #, c-format msgid " Actual size: %12d\n" msgstr "" -#: lib/signature.c:153 +#: lib/signature.c:152 msgid "No signature\n" msgstr "" -#: lib/signature.c:157 +#: lib/signature.c:156 msgid "Old PGP signature\n" msgstr "" -#: lib/signature.c:170 +#: lib/signature.c:167 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "" -#: lib/signature.c:226 +#: lib/signature.c:221 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "" -#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678 -#: lib/signature.c:711 +#: lib/signature.c:300 lib/signature.c:397 lib/signature.c:664 +#: lib/signature.c:697 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Gat ekki keyrt %s: %s\n" -#: lib/signature.c:323 +#: lib/signature.c:316 msgid "pgp failed\n" msgstr "pgp brást\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:330 +#: lib/signature.c:323 msgid "pgp failed to write signature\n" msgstr "pgp gat ekki lesið undirskriftina\n" -#: lib/signature.c:335 +#: lib/signature.c:328 #, c-format msgid "PGP sig size: %d\n" msgstr "" -#: lib/signature.c:351 lib/signature.c:451 +#: lib/signature.c:342 lib/signature.c:440 msgid "unable to read the signature\n" msgstr "get ekki lesið undirskriftina\n" -#: lib/signature.c:356 +#: lib/signature.c:347 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:423 +#: lib/signature.c:414 msgid "gpg failed\n" msgstr "ggp brást\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:430 +#: lib/signature.c:421 msgid "gpg failed to write signature\n" msgstr "gpg get ekki lesið undirskriftina\n" -#: lib/signature.c:435 +#: lib/signature.c:426 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:456 +#: lib/signature.c:445 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:716 lib/signature.c:771 +#: lib/signature.c:702 lib/signature.c:753 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:750 +#: lib/signature.c:732 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:763 +#: lib/signature.c:745 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/signature.c:807 +#: lib/signature.c:789 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:847 +#: lib/signature.c:825 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:906 +#: lib/signature.c:873 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1102 +#: lib/signature.c:1059 msgid "V3 RSA/MD5 signature: " msgstr "" -#: lib/signature.c:1221 +#: lib/signature.c:1168 msgid "Header " msgstr "" -#: lib/signature.c:1222 +#: lib/signature.c:1169 msgid "V3 DSA signature: " msgstr "" -#: lib/signature.c:1311 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1338 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1342 +#: lib/signature.c:1275 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:180 +#: lib/transaction.c:173 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:985 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1085 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:243 -msgid "package lacks both user name and id lists (this should never happen)\n" -msgstr "í pakkanum eru engir notandalistar (þetta ætti aldrei að koma fyrir)\n" - -#: lib/verify.c:264 -msgid "package lacks both group name and id lists (this should never happen)\n" -msgstr "í pakkanum eru engir hópalistar (þetta ætti aldrei að koma fyrir)\n" - -#: lib/verify.c:408 +#: lib/verify.c:324 #, c-format msgid "missing %s" msgstr "vantar %s" -#: lib/verify.c:505 +#: lib/verify.c:419 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Óuppfyllt pakkaskilyrði fyrir %s-%s-%s: " -#: lib/verify.c:543 +#: lib/verify.c:459 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3372,6 +3364,15 @@ msgstr "g msgid "failed to create %s: %s\n" msgstr "gat ekki búið til %s: %s\n" +#~ msgid "" +#~ "package lacks both user name and id lists (this should never happen)\n" +#~ msgstr "" +#~ "í pakkanum eru engir notandalistar (þetta ætti aldrei að koma fyrir)\n" + +#~ msgid "" +#~ "package lacks both group name and id lists (this should never happen)\n" +#~ msgstr "í pakkanum eru engir hópalistar (þetta ætti aldrei að koma fyrir)\n" + #~ msgid "Couldn't exec pgp (%s)\n" #~ msgstr "Gat ekki keyrt pgp (%s)\n" diff --git a/po/ja.po b/po/ja.po index 481da6f..0bb88fc 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-03-09 14:38-0500\n" +"POT-Creation-Date: 2002-03-12 11:41-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -862,7 +862,7 @@ msgstr " msgid "Could not open %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: build/pack.c:618 lib/psm.c:1444 +#: build/pack.c:618 lib/psm.c:1445 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" @@ -892,7 +892,7 @@ msgstr " msgid "Unable to write payload to %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" -#: build/pack.c:699 lib/psm.c:1725 +#: build/pack.c:699 lib/psm.c:1726 #, c-format msgid "Wrote: %s\n" msgstr "½ñ¤­¹þ¤ßÃæ: %s\n" @@ -1668,50 +1668,50 @@ msgstr " msgid "error creating temporary file %s\n" msgstr "°ì»þ¥Õ¥¡¥¤¥ë %s ¤ÎºîÀ®¥¨¥é¡¼" -#: lib/package.c:184 lib/package.c:260 +#: lib/package.c:181 lib/package.c:257 #, fuzzy msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" "¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: lib/package.c:205 lib/package.c:268 +#: lib/package.c:202 lib/package.c:265 #, fuzzy msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" "¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557 +#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553 #, c-format msgid "%s: readLead failed\n" msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/package.c:252 +#: lib/package.c:249 #, fuzzy, c-format msgid "%s: bad magic\n" msgstr "ÉÔÀµ¤Ê¥Þ¥¸¥Ã¥¯" -#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573 +#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578 +#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574 #, c-format msgid "%s: No signature available\n" msgstr "%s: Í­¸ú¤Ê½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: lib/package.c:331 lib/rpmchecksig.c:476 +#: lib/package.c:328 lib/rpmchecksig.c:474 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651 +#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505 +#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" @@ -2320,37 +2320,37 @@ msgstr " msgid "%s: %s has %d files, test = %d\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n" -#: lib/psm.c:1351 +#: lib/psm.c:1352 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1494 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "¥æ¡¼¥¶ %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/psm.c:1502 +#: lib/psm.c:1503 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "¥°¥ë¡¼¥× %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/psm.c:1544 +#: lib/psm.c:1545 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿­Ä¹¤Ë¼ºÇÔ %s%s: %s" -#: lib/psm.c:1545 +#: lib/psm.c:1546 #, fuzzy msgid " on file " msgstr "¥Õ¥¡¥¤¥ë¾å" -#: lib/psm.c:1733 +#: lib/psm.c:1734 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s" -#: lib/psm.c:1736 +#: lib/psm.c:1737 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s ¼ºÇÔ" @@ -2489,12 +2489,12 @@ msgstr " msgid "package %s is not installed\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: lib/rpmal.c:674 +#: lib/rpmal.c:673 #, fuzzy msgid "(added files)" msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" -#: lib/rpmal.c:771 +#: lib/rpmal.c:770 #, fuzzy msgid "(added provide)" msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" @@ -2514,58 +2514,58 @@ msgstr "makeTempFile msgid "%s: Fwrite failed: %s\n" msgstr "%s: Fwrite ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: lib/rpmchecksig.c:169 +#: lib/rpmchecksig.c:170 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: v1.0 ¤Î RPM ¤Ë¤Ï½ð̾¤Ç¤­¤Þ¤»¤ó\n" -#: lib/rpmchecksig.c:173 +#: lib/rpmchecksig.c:174 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: v2.0 ¤Î RPM ¤Ë¤ÏºÆ½ð̾¤Ç¤­¤Þ¤»¤ó\n" -#: lib/rpmchecksig.c:253 +#: lib/rpmchecksig.c:254 #, fuzzy, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: writedLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: lib/rpmchecksig.c:259 +#: lib/rpmchecksig.c:260 #, fuzzy, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignature ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/rpmchecksig.c:490 +#: lib/rpmchecksig.c:488 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/rpmchecksig.c:563 +#: lib/rpmchecksig.c:559 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Í­¸ú¤Ê½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó(v1.0 RPM)\n" -#: lib/rpmchecksig.c:810 +#: lib/rpmchecksig.c:804 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825 +#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819 #, fuzzy msgid " (MISSING KEYS:" msgstr " (¥­¡¼¤Îʶ¼º) " -#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827 +#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821 msgid ") " msgstr "" -#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828 +#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822 msgid " (UNTRUSTED KEYS:" msgstr " (¿®Íê¤Ç¤­¤Ê¤¤¸°:" -#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830 +#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824 msgid ")" msgstr "" -#: lib/rpmchecksig.c:824 +#: lib/rpmchecksig.c:818 msgid "OK" msgstr "" @@ -2778,191 +2778,177 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Æɤ߹þ¤à¤¿¤á¤Ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s¡£" -#: lib/signature.c:119 +#: lib/signature.c:118 msgid "file is not regular -- skipping size check\n" msgstr "" "¥Õ¥¡¥¤¥ë¤Ï°ìÈ̤Υե¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó -- ¥µ¥¤¥º¥Á¥§¥Ã¥¯¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" -#: lib/signature.c:128 +#: lib/signature.c:127 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:133 +#: lib/signature.c:132 #, fuzzy, c-format msgid " Actual size: %12d\n" msgstr "½ð̾¥µ¥¤¥º: %d\n" -#: lib/signature.c:153 +#: lib/signature.c:152 msgid "No signature\n" msgstr "½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: lib/signature.c:157 +#: lib/signature.c:156 msgid "Old PGP signature\n" msgstr "¸Å¤¤ PGP ½ð̾\n" -#: lib/signature.c:170 +#: lib/signature.c:167 #, fuzzy msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "¸Å¤¤(ÆâÉô¤À¤±¤Î)½ð̾! ¤É¤¦¤ä¤Ã¤Æ¤½¤ì¤ò¼ê¤Ë¤¤¤ì¤Þ¤·¤¿¤«!?" -#: lib/signature.c:226 +#: lib/signature.c:221 #, fuzzy, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "½ð̾¥µ¥¤¥º: %d\n" -#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678 -#: lib/signature.c:711 +#: lib/signature.c:300 lib/signature.c:397 lib/signature.c:664 +#: lib/signature.c:697 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "%s ¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s" -#: lib/signature.c:323 +#: lib/signature.c:316 #, fuzzy msgid "pgp failed\n" msgstr "pgp ¼ºÇÔ" #. PGP failed to write signature #. Just in case -#: lib/signature.c:330 +#: lib/signature.c:323 #, fuzzy msgid "pgp failed to write signature\n" msgstr "pgp ¤¬½ð̾¤ò½ñ¤­¹þ¤à¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: lib/signature.c:335 +#: lib/signature.c:328 #, c-format msgid "PGP sig size: %d\n" msgstr "PGP ½ð̾¥µ¥¤¥º: %s\n" -#: lib/signature.c:351 lib/signature.c:451 +#: lib/signature.c:342 lib/signature.c:440 #, fuzzy msgid "unable to read the signature\n" msgstr "½ð̾¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó" -#: lib/signature.c:356 +#: lib/signature.c:347 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "PGP ½ð̾¤Î %d ¥Ð¥¤¥È¤ò¼èÆÀ\n" -#: lib/signature.c:423 +#: lib/signature.c:414 #, fuzzy msgid "gpg failed\n" msgstr "gpg ¼ºÇÔ" #. GPG failed to write signature #. Just in case -#: lib/signature.c:430 +#: lib/signature.c:421 #, fuzzy msgid "gpg failed to write signature\n" msgstr "gpg ¤¬½ð̾¤ò½ñ¤­¹þ¤à¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: lib/signature.c:435 +#: lib/signature.c:426 #, fuzzy, c-format msgid "GPG sig size: %d\n" msgstr "GPG ½ð̾¥µ¥¤¥º: %s\n" -#: lib/signature.c:456 +#: lib/signature.c:445 #, fuzzy, c-format msgid "Got %d bytes of GPG sig\n" msgstr "GPG ½ð̾¤Î %d ¥Ð¥¤¥È¤ò¼èÆÀ\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:716 lib/signature.c:771 +#: lib/signature.c:702 lib/signature.c:753 #, fuzzy, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "¥Þ¥¯¥í¥Õ¥¡¥¤¥ëÃæ¤Î̵¸ú¤Ê %%_signature ¡£\n" -#: lib/signature.c:750 +#: lib/signature.c:732 #, fuzzy, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "¥Þ¥¯¥í¥Õ¥¡¥¤¥ë¤Ë \"%%_pgp_name\" ¤òÀßÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: lib/signature.c:763 +#: lib/signature.c:745 #, fuzzy, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "¥Þ¥¯¥í¥Õ¥¡¥¤¥ë¤Ë \"%%_pgp_name\" ¤òÀßÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: lib/signature.c:807 +#: lib/signature.c:789 #, fuzzy msgid "Header+Payload size: " msgstr "¥Ø¥Ã¥À¥µ¥¤¥º¤¬Â礭¤¹¤®¤Þ¤¹" -#: lib/signature.c:847 +#: lib/signature.c:825 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:906 +#: lib/signature.c:873 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1102 +#: lib/signature.c:1059 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "MD5 ½ð̾¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹" -#: lib/signature.c:1221 +#: lib/signature.c:1168 msgid "Header " msgstr "" -#: lib/signature.c:1222 +#: lib/signature.c:1169 #, fuzzy msgid "V3 DSA signature: " msgstr "½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: lib/signature.c:1311 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1338 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1342 +#: lib/signature.c:1275 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "½ð̾¥Ñ¥Ã¥É: %d\n" -#: lib/transaction.c:180 +#: lib/transaction.c:173 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:985 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n" -#: lib/transaction.c:1085 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "¥Þ¥¦¥ó¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥ê¥¹¥È¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹\n" -#: lib/verify.c:243 -#, fuzzy -msgid "package lacks both user name and id lists (this should never happen)\n" -msgstr "" -"¥Ñ¥Ã¥±¡¼¥¸¤Ï ¥æ¡¼¥¶Ì¾¤È id ¥ê¥¹¥È¤ÎξÊý¤¬·ç¤±¤Æ¤¤¤Þ¤¹(¤³¤ì¤Ï·è¤·¤Æµ¯¤­¤Æ¤Ï¤Ê" -"¤é¤Ê¤¤)" - -#: lib/verify.c:264 -#, fuzzy -msgid "package lacks both group name and id lists (this should never happen)\n" -msgstr "" -"¥Ñ¥Ã¥±¡¼¥¸¤Ï¥°¥ë¡¼¥×̾¤È id ¥ê¥¹¥È¤ÎξÊý¤¬·ç¤±¤Æ¤¤¤Þ¤¹(¤³¤ì¤Ï·è¤·¤Æµ¯¤­¤Æ¤Ï¤Ê" -"¤é¤Ê¤¤)" - -#: lib/verify.c:408 +#: lib/verify.c:324 #, fuzzy, c-format msgid "missing %s" msgstr "%s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" -#: lib/verify.c:505 +#: lib/verify.c:419 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À­¤òËþ¤¿¤·¤Æ¤¤¤Þ¤»¤ó:" -#: lib/verify.c:543 +#: lib/verify.c:459 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3575,6 +3561,20 @@ msgid "failed to create %s: %s\n" msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" #, fuzzy +#~ msgid "" +#~ "package lacks both user name and id lists (this should never happen)\n" +#~ msgstr "" +#~ "¥Ñ¥Ã¥±¡¼¥¸¤Ï ¥æ¡¼¥¶Ì¾¤È id ¥ê¥¹¥È¤ÎξÊý¤¬·ç¤±¤Æ¤¤¤Þ¤¹(¤³¤ì¤Ï·è¤·¤Æµ¯¤­¤Æ¤Ï" +#~ "¤Ê¤é¤Ê¤¤)" + +#, fuzzy +#~ msgid "" +#~ "package lacks both group name and id lists (this should never happen)\n" +#~ msgstr "" +#~ "¥Ñ¥Ã¥±¡¼¥¸¤Ï¥°¥ë¡¼¥×̾¤È id ¥ê¥¹¥È¤ÎξÊý¤¬·ç¤±¤Æ¤¤¤Þ¤¹(¤³¤ì¤Ï·è¤·¤Æµ¯¤­¤Æ" +#~ "¤Ï¤Ê¤é¤Ê¤¤)" + +#, fuzzy #~ msgid "========== Header RSA signature\n" #~ msgstr "¿·¤·¤¤¥Ø¥Ã¥À½ð̾\n" diff --git a/po/ko.po b/po/ko.po index 6f85409..e010278 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-03-09 14:38-0500\n" +"POT-Creation-Date: 2002-03-12 11:41-0500\n" "PO-Revision-Date: 2001-09-07 22:03+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -823,7 +823,7 @@ msgstr " msgid "Could not open %s: %s\n" msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:618 lib/psm.c:1444 +#: build/pack.c:618 lib/psm.c:1445 #, c-format msgid "Unable to write package: %s\n" msgstr "ÆÐÅ°Áö¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n" @@ -853,7 +853,7 @@ msgstr "%s msgid "Unable to write payload to %s: %s\n" msgstr "%s ¿¡ payload¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:699 lib/psm.c:1725 +#: build/pack.c:699 lib/psm.c:1726 #, c-format msgid "Wrote: %s\n" msgstr "ÀÛ¼º: %s\n" @@ -1612,47 +1612,47 @@ msgstr "%s ( msgid "error creating temporary file %s\n" msgstr "Àӽà ÆÄÀÏ %s (À»)¸¦ »ý¼ºÇÏ´Â µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: lib/package.c:184 lib/package.c:260 +#: lib/package.c:181 lib/package.c:257 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "ÀÌ RPM ¹öÀü¿¡¼­´Â ÆÐŰ¡ ¹öÀü '1' ÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù\n" -#: lib/package.c:205 lib/package.c:268 +#: lib/package.c:202 lib/package.c:265 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" "ÀÌ RPM ¹öÀü¿¡¼­´Â ÁÖ¿ä ¹øÈ£(major number) <= 4 ÀÇ ÆÐŰ¡ ¸¸À» Áö¿øÇÕ´Ï´Ù\n" -#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557 +#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553 #, c-format msgid "%s: readLead failed\n" msgstr "%s: readLead¿¡ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/package.c:252 +#: lib/package.c:249 #, fuzzy, c-format msgid "%s: bad magic\n" msgstr "À߸øµÈ magic ÀÔ´Ï´Ù" -#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573 +#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature¿¡ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578 +#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574 #, c-format msgid "%s: No signature available\n" msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù\n" -#: lib/package.c:331 lib/rpmchecksig.c:476 +#: lib/package.c:328 lib/rpmchecksig.c:474 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead¿¡ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651 +#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505 +#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n" @@ -2216,38 +2216,38 @@ msgstr "" msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s-%s-%s (ÀÌ)°¡ %d ÀÇ ÆÄÀÏÀ» °®°í ÀÖ½À´Ï´Ù, Å×½ºÆ® = %d\n" -#: lib/psm.c:1351 +#: lib/psm.c:1352 #, fuzzy, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" "%s: %s ½ºÅ©¸³Æ®¸´(scriptlet)°¡ ½ÇÆÐÇß½À´Ï´Ù (%d), %s-%s-%s (À»)¸¦ »ý·«ÇÕ´Ï" "´Ù\n" -#: lib/psm.c:1493 +#: lib/psm.c:1494 #, c-format msgid "user %s does not exist - using root\n" msgstr "%s »ç¿ëÀÚ°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:1502 +#: lib/psm.c:1503 #, c-format msgid "group %s does not exist - using root\n" msgstr "%s ±×·ìÀÌ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:1544 +#: lib/psm.c:1545 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¾ÆÄ«À̺긦 Ǫ´Âµ¥ ½ÇÆÐÇÔ%s%s: %s\n" -#: lib/psm.c:1545 +#: lib/psm.c:1546 msgid " on file " msgstr " ´ÙÀ½ ÆÄÀÏ¿¡ " -#: lib/psm.c:1733 +#: lib/psm.c:1734 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%2$s ÆÄÀÏÀÇ %1$s (ÀÌ)°¡ ½ÇÆÐÇÔ: %3$s\n" -#: lib/psm.c:1736 +#: lib/psm.c:1737 #, c-format msgid "%s failed: %s\n" msgstr "%s (ÀÌ)°¡ ½ÇÆÐÇÔ: %s\n" @@ -2384,12 +2384,12 @@ msgstr " msgid "package %s is not installed\n" msgstr "%s ÆÐÅ°Áö´Â ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/rpmal.c:674 +#: lib/rpmal.c:673 #, fuzzy msgid "(added files)" msgstr "À߸øµÈ db ÆÄÀÏ %s\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:770 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n" @@ -2408,57 +2408,57 @@ msgstr "makeTempFile msgid "%s: Fwrite failed: %s\n" msgstr "%s: Fwrite¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n" -#: lib/rpmchecksig.c:169 +#: lib/rpmchecksig.c:170 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: v1.0 RPMÀº ¼­¸íÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/rpmchecksig.c:173 +#: lib/rpmchecksig.c:174 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: v2.0 RPMÀº Àç-¼­¸íÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/rpmchecksig.c:253 +#: lib/rpmchecksig.c:254 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: writeLead¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n" -#: lib/rpmchecksig.c:259 +#: lib/rpmchecksig.c:260 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignature¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n" -#: lib/rpmchecksig.c:490 +#: lib/rpmchecksig.c:488 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead¿¡ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/rpmchecksig.c:563 +#: lib/rpmchecksig.c:559 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù (v1.0 RPM)\n" -#: lib/rpmchecksig.c:810 +#: lib/rpmchecksig.c:804 msgid "NOT OK" msgstr "¿Ã¹Ù¸£Áö ¾ÊÀ½" -#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825 +#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819 msgid " (MISSING KEYS:" msgstr " (Å°¸¦ ãÀ» ¼ö ¾øÀ½:" -#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827 +#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828 +#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822 msgid " (UNTRUSTED KEYS:" msgstr " (Å°¸¦ ½Å·ÚÇÒ ¼ö ¾øÀ½:" -#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830 +#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:824 +#: lib/rpmchecksig.c:818 msgid "OK" msgstr "È®ÀÎ" @@ -2670,180 +2670,170 @@ msgstr "%s ( msgid "Unable to open %s for reading: %s.\n" msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s.\n" -#: lib/signature.c:119 +#: lib/signature.c:118 msgid "file is not regular -- skipping size check\n" msgstr "ÆÄÀÏÀÌ ¿Ã¹Ù¸£Áö(regular) ¾Ê½À´Ï´Ù -- ¿ë·® °Ë»ç¸¦ »ý·«ÇÕ´Ï´Ù\n" -#: lib/signature.c:128 +#: lib/signature.c:127 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "¿¹»ó(Expected) ¿ë·®: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" -#: lib/signature.c:133 +#: lib/signature.c:132 #, c-format msgid " Actual size: %12d\n" msgstr " ½ÇÁ¦ ¿ë·®: %12d\n" -#: lib/signature.c:153 +#: lib/signature.c:152 msgid "No signature\n" msgstr "¼­¸íÀÌ ¾ø½À´Ï´Ù\n" -#: lib/signature.c:157 +#: lib/signature.c:156 msgid "Old PGP signature\n" msgstr "ÀÌÀü PGP ¼­¸í\n" -#: lib/signature.c:170 +#: lib/signature.c:167 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "ÀÌÀü (³»ºÎ-¿ë) ¼­¸í! ¾î¶»°Ô ¾òÀ¸¼Ì½À´Ï±î!?\n" -#: lib/signature.c:226 +#: lib/signature.c:221 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "¼­¸í: size(%d)+pad(%d)\n" -#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678 -#: lib/signature.c:711 +#: lib/signature.c:300 lib/signature.c:397 lib/signature.c:664 +#: lib/signature.c:697 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "%s (À»)¸¦ ½ÇÇàÇÒ ¼ö ¾øÀ½: %s\n" -#: lib/signature.c:323 +#: lib/signature.c:316 msgid "pgp failed\n" msgstr "pgp¿¡ ½ÇÆÐÇÔ\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:330 +#: lib/signature.c:323 msgid "pgp failed to write signature\n" msgstr "pgp ¼­¸íÀ» ÀÛ¼ºÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/signature.c:335 +#: lib/signature.c:328 #, c-format msgid "PGP sig size: %d\n" msgstr "PGP ¼­¸í ¿ë·®: %d\n" -#: lib/signature.c:351 lib/signature.c:451 +#: lib/signature.c:342 lib/signature.c:440 msgid "unable to read the signature\n" msgstr "¼­¸íÀ» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: lib/signature.c:356 +#: lib/signature.c:347 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "%d ¹ÙÀÌÆ®ÀÇ PGP ¼­¸íÀ» ¾ò¾ú½À´Ï´Ù\n" -#: lib/signature.c:423 +#: lib/signature.c:414 msgid "gpg failed\n" msgstr "gpg¿¡ ½ÇÆÐÇÔ\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:430 +#: lib/signature.c:421 msgid "gpg failed to write signature\n" msgstr "gpg ¼­¸íÀ» ÀÛ¼ºÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/signature.c:435 +#: lib/signature.c:426 #, c-format msgid "GPG sig size: %d\n" msgstr "GPG ¼­¸í ¿ë·®: %d\n" -#: lib/signature.c:456 +#: lib/signature.c:445 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "%d ¹ÙÀÌÆ®ÀÇ GPG ¼­¸íÀ» ¾ò¾ú½À´Ï´Ù\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:716 lib/signature.c:771 +#: lib/signature.c:702 lib/signature.c:753 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "¸ÅÅ©·Î ÆÄÀÏ¿¡ ºÎÀûÇÕÇÑ %%_signatureÀÇ ³»¿ëÀÌ ÀÖ½À´Ï´Ù\n" -#: lib/signature.c:750 +#: lib/signature.c:732 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "¸ÅÅ©·Î ÆÄÀÏ¿¡ \"%%_gpg_name\" À» ¼³Á¤ÇØ ÁÖ¼Å¾ß ÇÕ´Ï´Ù\n" -#: lib/signature.c:763 +#: lib/signature.c:745 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "¸ÅÅ©·Î ÆÄÀÏ¿¡ \"%%_pgp_name\" À» ¼³Á¤ÇØ ÁÖ¼Å¾ß ÇÕ´Ï´Ù\n" -#: lib/signature.c:807 +#: lib/signature.c:789 #, fuzzy msgid "Header+Payload size: " msgstr "Çì´õÀÇ Å©±â°¡ ³Ê¹« Å®´Ï´Ù" -#: lib/signature.c:847 +#: lib/signature.c:825 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:906 +#: lib/signature.c:873 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1102 +#: lib/signature.c:1059 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "MD5 ¼­¸íÀº °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/signature.c:1221 +#: lib/signature.c:1168 msgid "Header " msgstr "" -#: lib/signature.c:1222 +#: lib/signature.c:1169 #, fuzzy msgid "V3 DSA signature: " msgstr "¼­¸íÀÌ ¾ø½À´Ï´Ù\n" -#: lib/signature.c:1311 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1338 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1342 +#: lib/signature.c:1275 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "¼­¸í: size(%d)+pad(%d)\n" -#: lib/transaction.c:180 +#: lib/transaction.c:173 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "missingok Ç÷¡±×·Î ÀÎÇØ %s (À»)¸¦ »ý·«ÇÕ´Ï´Ù\n" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:985 #, c-format msgid "excluding directory %s\n" msgstr "%s µð·ºÅ丮¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" -#: lib/transaction.c:1085 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "¸¶¿îÆ®µÈ ÆÄÀϽýºÅÛÀÇ ¸ñ·ÏÀ» ¼öÁýÇÏ°í ÀÖ½À´Ï´Ù\n" -#: lib/verify.c:243 -msgid "package lacks both user name and id lists (this should never happen)\n" -msgstr "" -"ÆÐÅ°Áö¿¡ »ç¿ëÀÚ À̸§°ú id ¸ñ·ÏÀÌ ¾ø½À´Ï´Ù (Àý´ë ÀÌ·¸°Ô µÇ¾î¼­´Â ¾ÈµË´Ï´Ù)\n" - -#: lib/verify.c:264 -msgid "package lacks both group name and id lists (this should never happen)\n" -msgstr "" -"ÆÐÅ°Áö¿¡ ±×·ì À̸§°ú id ¸ñ·ÏÀÌ ¾ø½À´Ï´Ù (Àý´ë ÀÌ·¸°Ô µÇ¾î¼­´Â ¾ÈµË´Ï´Ù)\n" - -#: lib/verify.c:408 +#: lib/verify.c:324 #, c-format msgid "missing %s" msgstr "´ÙÀ½À» ãÀ» ¼ö ¾ø½À´Ï´Ù %s" -#: lib/verify.c:505 +#: lib/verify.c:419 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "%s-%s-%s ¿¡ ÀÇÁ¸¼º ¹®Á¦ ¹ß»ý: " -#: lib/verify.c:543 +#: lib/verify.c:459 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3448,6 +3438,17 @@ msgstr "URL msgid "failed to create %s: %s\n" msgstr "%s (À»)¸¦ »ý¼ºÇϴµ¥ ½ÇÆÐÇÔ: %s\n" +#~ msgid "" +#~ "package lacks both user name and id lists (this should never happen)\n" +#~ msgstr "" +#~ "ÆÐÅ°Áö¿¡ »ç¿ëÀÚ À̸§°ú id ¸ñ·ÏÀÌ ¾ø½À´Ï´Ù (Àý´ë ÀÌ·¸°Ô µÇ¾î¼­´Â ¾ÈµË´Ï" +#~ "´Ù)\n" + +#~ msgid "" +#~ "package lacks both group name and id lists (this should never happen)\n" +#~ msgstr "" +#~ "ÆÐÅ°Áö¿¡ ±×·ì À̸§°ú id ¸ñ·ÏÀÌ ¾ø½À´Ï´Ù (Àý´ë ÀÌ·¸°Ô µÇ¾î¼­´Â ¾ÈµË´Ï´Ù)\n" + #, fuzzy #~ msgid "sign a package, discarding all current signatures" #~ msgstr "ÆÐÅ°Áö¿¡ ¼­¸íÇÕ´Ï´Ù (±âÁ¸ÀÇ ¼­¸íÀº »èÁ¦µË´Ï´Ù)" diff --git a/po/no.po b/po/no.po index db712e4..bdc54dd 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-03-09 14:38-0500\n" +"POT-Creation-Date: 2002-03-12 11:41-0500\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -826,7 +826,7 @@ msgstr "Kunne ikke msgid "Could not open %s: %s\n" msgstr "Kunne ikke åpne %s: %s\n" -#: build/pack.c:618 lib/psm.c:1444 +#: build/pack.c:618 lib/psm.c:1445 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunne ikke skrive pakke: %s\n" @@ -856,7 +856,7 @@ msgstr "Kunne ikke lese \"payload\" fra %s: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "Kunne ikke skrive \"payload\" til %s: %s\n" -#: build/pack.c:699 lib/psm.c:1725 +#: build/pack.c:699 lib/psm.c:1726 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1604,46 +1604,46 @@ msgstr "%s opprettet som %s\n" msgid "error creating temporary file %s\n" msgstr "feil under oppretting av midlertidig fil %s\n" -#: lib/package.c:184 lib/package.c:260 +#: lib/package.c:181 lib/package.c:257 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" -#: lib/package.c:205 lib/package.c:268 +#: lib/package.c:202 lib/package.c:265 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" -#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557 +#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553 #, c-format msgid "%s: readLead failed\n" msgstr "%s: readLead feilet\n" -#: lib/package.c:252 +#: lib/package.c:249 #, fuzzy, c-format msgid "%s: bad magic\n" msgstr "Ugyldig magi" -#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573 +#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature feilet\n" -#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578 +#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574 #, c-format msgid "%s: No signature available\n" msgstr "%s: Ingen signatur tilgjengelig\n" -#: lib/package.c:331 lib/rpmchecksig.c:476 +#: lib/package.c:328 lib/rpmchecksig.c:474 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead feilet\n" -#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651 +#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505 +#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread feilet: %s\n" @@ -2192,36 +2192,36 @@ msgstr "" msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1351 +#: lib/psm.c:1352 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1494 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1502 +#: lib/psm.c:1503 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1544 +#: lib/psm.c:1545 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1545 +#: lib/psm.c:1546 msgid " on file " msgstr "" -#: lib/psm.c:1733 +#: lib/psm.c:1734 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "klarte ikke å åpne %s: %s\n" -#: lib/psm.c:1736 +#: lib/psm.c:1737 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s feilet\n" @@ -2358,11 +2358,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "pakke %s er ikke installert\n" -#: lib/rpmal.c:674 +#: lib/rpmal.c:673 msgid "(added files)" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:770 msgid "(added provide)" msgstr "" @@ -2380,57 +2380,57 @@ msgstr "makeTempFile feilet\n" msgid "%s: Fwrite failed: %s\n" msgstr "%s: Fwrite feilet: %s\n" -#: lib/rpmchecksig.c:169 +#: lib/rpmchecksig.c:170 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: kan ikke signere v1.0 RPM\n" -#: lib/rpmchecksig.c:173 +#: lib/rpmchecksig.c:174 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: Kan ikke signere v2.0 RPM på nytt\n" -#: lib/rpmchecksig.c:253 +#: lib/rpmchecksig.c:254 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: writeLead feilet: %s\n" -#: lib/rpmchecksig.c:259 +#: lib/rpmchecksig.c:260 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignature feilet: %s\n" -#: lib/rpmchecksig.c:490 +#: lib/rpmchecksig.c:488 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead feilet\n" -#: lib/rpmchecksig.c:563 +#: lib/rpmchecksig.c:559 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Ingen signatur tilgjengelig (v1.0 RPM)\n" -#: lib/rpmchecksig.c:810 +#: lib/rpmchecksig.c:804 msgid "NOT OK" msgstr "IKKE OK" -#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825 +#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827 +#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821 msgid ") " msgstr "" -#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828 +#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830 +#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824 msgid ")" msgstr "" -#: lib/rpmchecksig.c:824 +#: lib/rpmchecksig.c:818 msgid "OK" msgstr "OK" @@ -2640,177 +2640,169 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: lib/signature.c:119 +#: lib/signature.c:118 msgid "file is not regular -- skipping size check\n" msgstr "" -#: lib/signature.c:128 +#: lib/signature.c:127 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:133 +#: lib/signature.c:132 #, c-format msgid " Actual size: %12d\n" msgstr "" -#: lib/signature.c:153 +#: lib/signature.c:152 msgid "No signature\n" msgstr "" -#: lib/signature.c:157 +#: lib/signature.c:156 msgid "Old PGP signature\n" msgstr "" -#: lib/signature.c:170 +#: lib/signature.c:167 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "" -#: lib/signature.c:226 +#: lib/signature.c:221 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "" -#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678 -#: lib/signature.c:711 +#: lib/signature.c:300 lib/signature.c:397 lib/signature.c:664 +#: lib/signature.c:697 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Kunne ikke kjøre %s: %s\n" -#: lib/signature.c:323 +#: lib/signature.c:316 msgid "pgp failed\n" msgstr "" #. PGP failed to write signature #. Just in case -#: lib/signature.c:330 +#: lib/signature.c:323 msgid "pgp failed to write signature\n" msgstr "" -#: lib/signature.c:335 +#: lib/signature.c:328 #, c-format msgid "PGP sig size: %d\n" msgstr "" -#: lib/signature.c:351 lib/signature.c:451 +#: lib/signature.c:342 lib/signature.c:440 msgid "unable to read the signature\n" msgstr "" -#: lib/signature.c:356 +#: lib/signature.c:347 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:423 +#: lib/signature.c:414 msgid "gpg failed\n" msgstr "" #. GPG failed to write signature #. Just in case -#: lib/signature.c:430 +#: lib/signature.c:421 msgid "gpg failed to write signature\n" msgstr "" -#: lib/signature.c:435 +#: lib/signature.c:426 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:456 +#: lib/signature.c:445 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:716 lib/signature.c:771 +#: lib/signature.c:702 lib/signature.c:753 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:750 +#: lib/signature.c:732 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:763 +#: lib/signature.c:745 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/signature.c:807 +#: lib/signature.c:789 #, fuzzy msgid "Header+Payload size: " msgstr "For stor header" -#: lib/signature.c:847 +#: lib/signature.c:825 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:906 +#: lib/signature.c:873 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1102 +#: lib/signature.c:1059 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "hopp over MD5-signaturer" -#: lib/signature.c:1221 +#: lib/signature.c:1168 msgid "Header " msgstr "" -#: lib/signature.c:1222 +#: lib/signature.c:1169 msgid "V3 DSA signature: " msgstr "" -#: lib/signature.c:1311 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1338 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1342 +#: lib/signature.c:1275 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:180 +#: lib/transaction.c:173 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:985 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer katalog %s\n" -#: lib/transaction.c:1085 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "henter liste over monterte filsystemer\n" -#: lib/verify.c:243 -msgid "package lacks both user name and id lists (this should never happen)\n" -msgstr "" - -#: lib/verify.c:264 -msgid "package lacks both group name and id lists (this should never happen)\n" -msgstr "" - -#: lib/verify.c:408 +#: lib/verify.c:324 #, c-format msgid "missing %s" msgstr "mangler %s" -#: lib/verify.c:505 +#: lib/verify.c:419 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "feilede avhengigheter:\n" -#: lib/verify.c:543 +#: lib/verify.c:459 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/pl.po b/po/pl.po index d1fd3d6..80a4fbf 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-03-09 14:38-0500\n" +"POT-Creation-Date: 2002-03-12 11:41-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -852,7 +852,7 @@ msgstr "Nie mo msgid "Could not open %s: %s\n" msgstr "Nie mo¿na otworzyæ %s\n" -#: build/pack.c:618 lib/psm.c:1444 +#: build/pack.c:618 lib/psm.c:1445 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nie mo¿na zapisaæ pakietu: %s" @@ -882,7 +882,7 @@ msgstr "Nie mo msgid "Unable to write payload to %s: %s\n" msgstr "Nie mo¿na zapisaæ pakietu: %s" -#: build/pack.c:699 lib/psm.c:1725 +#: build/pack.c:699 lib/psm.c:1726 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -1651,50 +1651,50 @@ msgstr "ostrze msgid "error creating temporary file %s\n" msgstr "b³±d w tworzeniu pliku tymczasowego %s" -#: lib/package.c:184 lib/package.c:260 +#: lib/package.c:181 lib/package.c:257 #, fuzzy msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" "tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a" -#: lib/package.c:205 lib/package.c:268 +#: lib/package.c:202 lib/package.c:265 #, fuzzy msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" "tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a" -#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557 +#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553 #, c-format msgid "%s: readLead failed\n" msgstr "%s: readLead nie powiod³o siê\n" -#: lib/package.c:252 +#: lib/package.c:249 #, fuzzy, c-format msgid "%s: bad magic\n" msgstr "B³êdny magic" -#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573 +#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature nie powiod³o siê\n" -#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578 +#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574 #, c-format msgid "%s: No signature available\n" msgstr "%s: Sygnatura nie jest dostêpna\n" -#: lib/package.c:331 lib/rpmchecksig.c:476 +#: lib/package.c:328 lib/rpmchecksig.c:474 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead nie powiod³o siê\n" -#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651 +#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505 +#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: readLead nie powiod³o siê\n" @@ -2278,36 +2278,36 @@ msgstr "wykonanie skryptu nie powiod msgid "%s: %s has %d files, test = %d\n" msgstr "pakiet: %s-%s-%s test plików = %d\n" -#: lib/psm.c:1351 +#: lib/psm.c:1352 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1494 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "u¿ytkownik %s nie istnieje - u¿yto konta root" -#: lib/psm.c:1502 +#: lib/psm.c:1503 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s nie istnieje - u¿yto grupy root" -#: lib/psm.c:1544 +#: lib/psm.c:1545 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozpakowanie archiwum nie powiod³o siê %s%s: %s" -#: lib/psm.c:1545 +#: lib/psm.c:1546 msgid " on file " msgstr " na pliku " -#: lib/psm.c:1733 +#: lib/psm.c:1734 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nie mo¿na otworzyæ %s: %s" -#: lib/psm.c:1736 +#: lib/psm.c:1737 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s nie powiod³o siê" @@ -2446,12 +2446,12 @@ msgstr "nie mo msgid "package %s is not installed\n" msgstr "pakiet %s nie jest zainstalowany\n" -#: lib/rpmal.c:674 +#: lib/rpmal.c:673 #, fuzzy msgid "(added files)" msgstr "b³êdny status pliku: %s" -#: lib/rpmal.c:771 +#: lib/rpmal.c:770 #, fuzzy msgid "(added provide)" msgstr "Udostêpniane zasoby:" @@ -2471,57 +2471,57 @@ msgstr "wykonanie nie powiod msgid "%s: Fwrite failed: %s\n" msgstr "%s: readLead nie powiod³o siê\n" -#: lib/rpmchecksig.c:169 +#: lib/rpmchecksig.c:170 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: Nie mo¿na podpisaæ v1.0 RPM\n" -#: lib/rpmchecksig.c:173 +#: lib/rpmchecksig.c:174 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: Nie mo¿na ponownie podpisaæ v2.0 RPM\n" -#: lib/rpmchecksig.c:253 +#: lib/rpmchecksig.c:254 #, fuzzy, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: readLead nie powiod³o siê\n" -#: lib/rpmchecksig.c:259 +#: lib/rpmchecksig.c:260 #, fuzzy, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmReadSignature nie powiod³o siê\n" -#: lib/rpmchecksig.c:490 +#: lib/rpmchecksig.c:488 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead nie powiod³o siê\n" -#: lib/rpmchecksig.c:563 +#: lib/rpmchecksig.c:559 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Sygnatura nie jest dostêpna (v1.0 RPM)\n" -#: lib/rpmchecksig.c:810 +#: lib/rpmchecksig.c:804 msgid "NOT OK" msgstr "NIE DOBRZE" -#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825 +#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819 msgid " (MISSING KEYS:" msgstr " (BRAK KLUCZY:" -#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827 +#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828 +#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822 msgid " (UNTRUSTED KEYS:" msgstr "(NIEWIARYGODNE KLUCZE:" -#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830 +#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:824 +#: lib/rpmchecksig.c:818 msgid "OK" msgstr "OK" @@ -2732,190 +2732,176 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Nie mo¿na otworzyæ %s do odczytu: %s." -#: lib/signature.c:119 +#: lib/signature.c:118 msgid "file is not regular -- skipping size check\n" msgstr "plik nieregularny -- sprawdzanie rozmiaru pominiête\n" -#: lib/signature.c:128 +#: lib/signature.c:127 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:133 +#: lib/signature.c:132 #, fuzzy, c-format msgid " Actual size: %12d\n" msgstr "Rozmiar sygnatury: %d\n" -#: lib/signature.c:153 +#: lib/signature.c:152 msgid "No signature\n" msgstr "Brak sygnatury\n" -#: lib/signature.c:157 +#: lib/signature.c:156 msgid "Old PGP signature\n" msgstr "Stara sygnatura PGP\n" -#: lib/signature.c:170 +#: lib/signature.c:167 #, fuzzy msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "Stara (tylko wewnêtrzna) sygnatura! Sk±d Ty to wzi±³e¶!?" -#: lib/signature.c:226 +#: lib/signature.c:221 #, fuzzy, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "Rozmiar sygnatury: %d\n" -#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678 -#: lib/signature.c:711 +#: lib/signature.c:300 lib/signature.c:397 lib/signature.c:664 +#: lib/signature.c:697 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Nie mo¿na uruchomiæ %s" -#: lib/signature.c:323 +#: lib/signature.c:316 #, fuzzy msgid "pgp failed\n" msgstr "pgp nie powiod³o siê" #. PGP failed to write signature #. Just in case -#: lib/signature.c:330 +#: lib/signature.c:323 #, fuzzy msgid "pgp failed to write signature\n" msgstr "zapisanie sygnatury przez pgp nie powiod³o siê" -#: lib/signature.c:335 +#: lib/signature.c:328 #, c-format msgid "PGP sig size: %d\n" msgstr "rozmiar sygnatury PGP: %d\n" -#: lib/signature.c:351 lib/signature.c:451 +#: lib/signature.c:342 lib/signature.c:440 #, fuzzy msgid "unable to read the signature\n" msgstr "nie mo¿na odczytaæ sygnatury" -#: lib/signature.c:356 +#: lib/signature.c:347 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "Mam %d bajtów sygnatury PGP\n" -#: lib/signature.c:423 +#: lib/signature.c:414 #, fuzzy msgid "gpg failed\n" msgstr "gpg nie powiod³o siê" #. GPG failed to write signature #. Just in case -#: lib/signature.c:430 +#: lib/signature.c:421 #, fuzzy msgid "gpg failed to write signature\n" msgstr "zapisanie sygnatury przez gpg nie powiod³o siê" -#: lib/signature.c:435 +#: lib/signature.c:426 #, c-format msgid "GPG sig size: %d\n" msgstr "rozmiar sygnatury GPG: %d\n" -#: lib/signature.c:456 +#: lib/signature.c:445 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "Mam %d bajtów sygnatury GPG\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:716 lib/signature.c:771 +#: lib/signature.c:702 lib/signature.c:753 #, fuzzy, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "B³êdny %%_signature spec w pliku makra.\n" -#: lib/signature.c:750 +#: lib/signature.c:732 #, fuzzy, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Musisz ustawiæ \"%%_gpg_name\" w pliku swego makra" -#: lib/signature.c:763 +#: lib/signature.c:745 #, fuzzy, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Musisz ustawiæ \"%%_pgp_name\" w pliku swego makra" -#: lib/signature.c:807 +#: lib/signature.c:789 #, fuzzy msgid "Header+Payload size: " msgstr "Rozmiar nag³ówka jest zbyt du¿y" -#: lib/signature.c:847 +#: lib/signature.c:825 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:906 +#: lib/signature.c:873 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1102 +#: lib/signature.c:1059 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "pomiñ wszelkie sygnatury MD5" -#: lib/signature.c:1221 +#: lib/signature.c:1168 msgid "Header " msgstr "" -#: lib/signature.c:1222 +#: lib/signature.c:1169 #, fuzzy msgid "V3 DSA signature: " msgstr "Brak sygnatury\n" -#: lib/signature.c:1311 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1338 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1342 +#: lib/signature.c:1275 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Blok sygnatury: %d\n" -#: lib/transaction.c:180 +#: lib/transaction.c:173 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s pominiêty z powodu flagi missingok\n" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:985 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: lib/transaction.c:1085 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:243 -#, fuzzy -msgid "package lacks both user name and id lists (this should never happen)\n" -msgstr "" -"pakiet nie specyfikuje ani nazwy u¿ytkownika ani list id (to nie powinno siê " -"zdarzyæ)" - -#: lib/verify.c:264 -#, fuzzy -msgid "package lacks both group name and id lists (this should never happen)\n" -msgstr "" -"pakiet nie specyfikuje ani nazwy grupy ani list id (to nie powinno siê " -"zdarzyæ)" - -#: lib/verify.c:408 +#: lib/verify.c:324 #, fuzzy, c-format msgid "missing %s" msgstr "brak %s\n" -#: lib/verify.c:505 +#: lib/verify.c:419 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: " -#: lib/verify.c:543 +#: lib/verify.c:459 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3517,6 +3503,20 @@ msgid "failed to create %s: %s\n" msgstr "utworzenie %s nie powiod³o siê\n" #, fuzzy +#~ msgid "" +#~ "package lacks both user name and id lists (this should never happen)\n" +#~ msgstr "" +#~ "pakiet nie specyfikuje ani nazwy u¿ytkownika ani list id (to nie powinno " +#~ "siê zdarzyæ)" + +#, fuzzy +#~ msgid "" +#~ "package lacks both group name and id lists (this should never happen)\n" +#~ msgstr "" +#~ "pakiet nie specyfikuje ani nazwy grupy ani list id (to nie powinno siê " +#~ "zdarzyæ)" + +#, fuzzy #~ msgid "========== Header RSA signature\n" #~ msgstr "Nowa sygnatura nag³ówka\n" diff --git a/po/pt.po b/po/pt.po index 26ee0f7..66e044e 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-03-09 14:38-0500\n" +"POT-Creation-Date: 2002-03-12 11:41-0500\n" "PO-Revision-Date: 2000-06-22 01:13+01:00\n" "Last-Translator: José Nuno Coelho Sanarra Pires\n" "Language-Team: pt \n" @@ -824,7 +824,7 @@ msgstr "N msgid "Could not open %s: %s\n" msgstr "Não consigo aceder ao %s: %s\n" -#: build/pack.c:618 lib/psm.c:1444 +#: build/pack.c:618 lib/psm.c:1445 #, c-format msgid "Unable to write package: %s\n" msgstr "Não consegui gravar o pacote: %s\n" @@ -854,7 +854,7 @@ msgstr "N msgid "Unable to write payload to %s: %s\n" msgstr "Não consegui escrever o conteúdo de %s: %s\n" -#: build/pack.c:699 lib/psm.c:1725 +#: build/pack.c:699 lib/psm.c:1726 #, c-format msgid "Wrote: %s\n" msgstr "Gravei: %s\n" @@ -1607,46 +1607,46 @@ msgstr "%s criado como %s\n" msgid "error creating temporary file %s\n" msgstr "erro ao criar o ficheiro temporário %s\n" -#: lib/package.c:184 lib/package.c:260 +#: lib/package.c:181 lib/package.c:257 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "a versão 1 dos pacotes não é suportada por esta versão do RPM\n" -#: lib/package.c:205 lib/package.c:268 +#: lib/package.c:202 lib/package.c:265 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "só os pacotes com versão <= 4 são suportados por esta versão do RPM\n" -#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557 +#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553 #, c-format msgid "%s: readLead failed\n" msgstr ":%s: o readLead falhou\n" -#: lib/package.c:252 +#: lib/package.c:249 #, fuzzy, c-format msgid "%s: bad magic\n" msgstr "Código de integridade inválido" -#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573 +#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: o rpmReadSignature falhou\n" -#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578 +#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574 #, c-format msgid "%s: No signature available\n" msgstr "%s: Nenhuma assinatura disponível\n" -#: lib/package.c:331 lib/rpmchecksig.c:476 +#: lib/package.c:328 lib/rpmchecksig.c:474 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr ":%s: o readLead falhou\n" -#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651 +#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505 +#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: O fread falhou: %s\n" @@ -2206,36 +2206,36 @@ msgstr "a execu msgid "%s: %s has %d files, test = %d\n" msgstr "pacote: teste dos ficheiros do %s-%s-%s = %d\n" -#: lib/psm.c:1351 +#: lib/psm.c:1352 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1494 #, c-format msgid "user %s does not exist - using root\n" msgstr "o utilizador %s não existe - a usar o root\n" -#: lib/psm.c:1502 +#: lib/psm.c:1503 #, c-format msgid "group %s does not exist - using root\n" msgstr "o grupo %s não existe - a usar o root\n" -#: lib/psm.c:1544 +#: lib/psm.c:1545 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "a abertura do pacote falhou%s%s: %s\n" -#: lib/psm.c:1545 +#: lib/psm.c:1546 msgid " on file " msgstr " no ficheiro " -#: lib/psm.c:1733 +#: lib/psm.c:1734 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "falhei ao aceder ao %s: %s\n" -#: lib/psm.c:1736 +#: lib/psm.c:1737 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "O %s falhou\n" @@ -2372,12 +2372,12 @@ msgstr "o registo %d n msgid "package %s is not installed\n" msgstr "o pacote %s não está instalado\n" -#: lib/rpmal.c:674 +#: lib/rpmal.c:673 #, fuzzy msgid "(added files)" msgstr "ficheiro db inválido %s\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:770 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s SI (oferecidos pelo db)\n" @@ -2396,57 +2396,57 @@ msgstr "o makeTempFile falhou\n" msgid "%s: Fwrite failed: %s\n" msgstr "%s: O fwrite falhou: %s\n" -#: lib/rpmchecksig.c:169 +#: lib/rpmchecksig.c:170 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: Não consigo assinar o RPM v1.0\n" -#: lib/rpmchecksig.c:173 +#: lib/rpmchecksig.c:174 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: não consigo assinar de novo o RPM v2.0\n" -#: lib/rpmchecksig.c:253 +#: lib/rpmchecksig.c:254 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: o writeLead falhou: %s\n" -#: lib/rpmchecksig.c:259 +#: lib/rpmchecksig.c:260 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: o rpmWriteSignature falhou: %s\n" -#: lib/rpmchecksig.c:490 +#: lib/rpmchecksig.c:488 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr ":%s: o readLead falhou\n" -#: lib/rpmchecksig.c:563 +#: lib/rpmchecksig.c:559 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Nenhuma assinatura disponível (RPM v1.0)\n" -#: lib/rpmchecksig.c:810 +#: lib/rpmchecksig.c:804 msgid "NOT OK" msgstr "NÃO-OK" -#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825 +#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819 msgid " (MISSING KEYS:" msgstr " (FALTAM AS CHAVES:" -#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827 +#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828 +#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822 msgid " (UNTRUSTED KEYS:" msgstr " (CHAVES SUSPEITAS:" -#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830 +#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:824 +#: lib/rpmchecksig.c:818 msgid "OK" msgstr "OK" @@ -2658,178 +2658,170 @@ msgstr "N msgid "Unable to open %s for reading: %s.\n" msgstr "Não consegui abrir o %s para leitura: %s.\n" -#: lib/signature.c:119 +#: lib/signature.c:118 msgid "file is not regular -- skipping size check\n" msgstr "o ficheiro não é normal -- a ignorar a verificação do tamanho\n" -#: lib/signature.c:128 +#: lib/signature.c:127 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "Esperado um tamanho: %12d = início(%d)+assin.(%d)+'pad'(%d)+dados(%d)\n" -#: lib/signature.c:133 +#: lib/signature.c:132 #, c-format msgid " Actual size: %12d\n" msgstr " Tamanho real: %12d\n" -#: lib/signature.c:153 +#: lib/signature.c:152 msgid "No signature\n" msgstr "Sem assinatura\n" -#: lib/signature.c:157 +#: lib/signature.c:156 msgid "Old PGP signature\n" msgstr "Assinatura PGP antiga\n" -#: lib/signature.c:170 +#: lib/signature.c:167 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "Assinatura (só interna) antiga! Como é que obteve isto!?\n" -#: lib/signature.c:226 +#: lib/signature.c:221 #, fuzzy, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "Tamanho da assinatura: %d\n" -#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678 -#: lib/signature.c:711 +#: lib/signature.c:300 lib/signature.c:397 lib/signature.c:664 +#: lib/signature.c:697 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Não consegui executar o %s: %S\n" -#: lib/signature.c:323 +#: lib/signature.c:316 msgid "pgp failed\n" msgstr "o pgp falhou\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:330 +#: lib/signature.c:323 msgid "pgp failed to write signature\n" msgstr "o pgp não conseguiu gravar a assinatura\n" -#: lib/signature.c:335 +#: lib/signature.c:328 #, c-format msgid "PGP sig size: %d\n" msgstr "tamanho da assinatura do PGP: %d\n" -#: lib/signature.c:351 lib/signature.c:451 +#: lib/signature.c:342 lib/signature.c:440 msgid "unable to read the signature\n" msgstr "incapaz de ler a assinatura\n" -#: lib/signature.c:356 +#: lib/signature.c:347 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "Obtive %d bytes da assinatura PGP\n" -#: lib/signature.c:423 +#: lib/signature.c:414 msgid "gpg failed\n" msgstr "o gpg falhou\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:430 +#: lib/signature.c:421 msgid "gpg failed to write signature\n" msgstr "o gpg não conseguiu gravar a assinatura\n" -#: lib/signature.c:435 +#: lib/signature.c:426 #, c-format msgid "GPG sig size: %d\n" msgstr "Tamanho da assinatura do GPG: %d\n" -#: lib/signature.c:456 +#: lib/signature.c:445 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "Obtive %d bytes da assinatura do GPG\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:716 lib/signature.c:771 +#: lib/signature.c:702 lib/signature.c:753 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "'Spec' %%_signature inválido no ficheiro de macros\n" -#: lib/signature.c:750 +#: lib/signature.c:732 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Precisa definir o \"%%_gpg_name\" no seu ficheiro de macros\n" -#: lib/signature.c:763 +#: lib/signature.c:745 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Precisa definir o \"%%_pgp_name\" no seu ficheiro de macros\n" -#: lib/signature.c:807 +#: lib/signature.c:789 #, fuzzy msgid "Header+Payload size: " msgstr "Tamanho do cabeçalho demasiado grande" -#: lib/signature.c:847 +#: lib/signature.c:825 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:906 +#: lib/signature.c:873 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1102 +#: lib/signature.c:1059 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "ignorar as assinaturas de MD5" -#: lib/signature.c:1221 +#: lib/signature.c:1168 msgid "Header " msgstr "" -#: lib/signature.c:1222 +#: lib/signature.c:1169 #, fuzzy msgid "V3 DSA signature: " msgstr "Sem assinatura\n" -#: lib/signature.c:1311 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1338 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1342 +#: lib/signature.c:1275 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "'Pad' ou preenchimento da assinatura: %d\n" -#: lib/transaction.c:180 +#: lib/transaction.c:173 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ignorado devido à opção missingok\n" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:985 #, c-format msgid "excluding directory %s\n" msgstr "a excluir a directoria %s\n" -#: lib/transaction.c:1085 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "a obter a lista dos sistemas de ficheiros montados\n" -#: lib/verify.c:243 -msgid "package lacks both user name and id lists (this should never happen)\n" -msgstr "o pacote não tem o nome de utilizador nem as listas de IDs (nunca deve ocorrer)\n" - -#: lib/verify.c:264 -msgid "package lacks both group name and id lists (this should never happen)\n" -msgstr "o pacote não tem o nome do grupo nem as listas de IDs (nunca deve ocorrer)\n" - -#: lib/verify.c:408 +#: lib/verify.c:324 #, c-format msgid "missing %s" msgstr "falta %s" -#: lib/verify.c:505 +#: lib/verify.c:419 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Dependências não satisfeitas para o %s-%s-%s: " -#: lib/verify.c:543 +#: lib/verify.c:459 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3424,6 +3416,14 @@ msgstr "o porto do URL tem de ser um n msgid "failed to create %s: %s\n" msgstr "não consegui criar o %s: %s\n" +#~ msgid "" +#~ "package lacks both user name and id lists (this should never happen)\n" +#~ msgstr "o pacote não tem o nome de utilizador nem as listas de IDs (nunca deve ocorrer)\n" + +#~ msgid "" +#~ "package lacks both group name and id lists (this should never happen)\n" +#~ msgstr "o pacote não tem o nome do grupo nem as listas de IDs (nunca deve ocorrer)\n" + #, fuzzy #~ msgid "========== Header RSA signature\n" #~ msgstr "========== a realizar o tsort nos pacotes\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 0caa617..7c821ee 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-03-09 14:38-0500\n" +"POT-Creation-Date: 2002-03-12 11:41-0500\n" #: build.c:36 #, fuzzy @@ -912,7 +912,7 @@ msgid "Could not open %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:618 lib/psm.c:1444 +#: build/pack.c:618 lib/psm.c:1445 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "No consegui abrir: %s\n" @@ -947,7 +947,7 @@ msgstr "No consegui abrir: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "No consegui abrir: %s\n" -#: build/pack.c:699 lib/psm.c:1725 +#: build/pack.c:699 lib/psm.c:1726 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1769,48 +1769,48 @@ msgstr "No consegui abrir: %s\n" msgid "error creating temporary file %s\n" msgstr "No consegui abrir: %s\n" -#: lib/package.c:184 lib/package.c:260 +#: lib/package.c:181 lib/package.c:257 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" -#: lib/package.c:205 lib/package.c:268 +#: lib/package.c:202 lib/package.c:265 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" -#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557 +#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553 #, c-format msgid "%s: readLead failed\n" msgstr "" -#: lib/package.c:252 +#: lib/package.c:249 #, c-format msgid "%s: bad magic\n" msgstr "" -#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573 +#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "" -#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578 +#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574 #, c-format msgid "%s: No signature available\n" msgstr "" # , c-format -#: lib/package.c:331 lib/rpmchecksig.c:476 +#: lib/package.c:328 lib/rpmchecksig.c:474 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "No consegui abrir: %s\n" -#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651 +#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" # , c-format -#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505 +#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "No consegui abrir: %s\n" @@ -2400,37 +2400,37 @@ msgstr "" msgid "%s: %s has %d files, test = %d\n" msgstr "no foi passado pacote para instalao" -#: lib/psm.c:1351 +#: lib/psm.c:1352 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1494 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1502 +#: lib/psm.c:1503 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1544 +#: lib/psm.c:1545 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "Construo falhou.\n" -#: lib/psm.c:1545 +#: lib/psm.c:1546 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:1733 +#: lib/psm.c:1734 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:1736 +#: lib/psm.c:1737 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "Construo falhou.\n" @@ -2574,12 +2574,12 @@ msgid "package %s is not installed\n" msgstr "no foi passado pacote para instalao" # , c-format -#: lib/rpmal.c:674 +#: lib/rpmal.c:673 #, fuzzy msgid "(added files)" msgstr "No consegui abrir: %s\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:770 msgid "(added provide)" msgstr "" @@ -2600,59 +2600,59 @@ msgstr "Construo falhou.\n" msgid "%s: Fwrite failed: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpmchecksig.c:169 +#: lib/rpmchecksig.c:170 #, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "" -#: lib/rpmchecksig.c:173 +#: lib/rpmchecksig.c:174 #, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "" -#: lib/rpmchecksig.c:253 +#: lib/rpmchecksig.c:254 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "" # , c-format -#: lib/rpmchecksig.c:259 +#: lib/rpmchecksig.c:260 #, fuzzy, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/rpmchecksig.c:490 +#: lib/rpmchecksig.c:488 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "No consegui abrir: %s\n" -#: lib/rpmchecksig.c:563 +#: lib/rpmchecksig.c:559 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "" -#: lib/rpmchecksig.c:810 +#: lib/rpmchecksig.c:804 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825 +#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827 +#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821 msgid ") " msgstr "" -#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828 +#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830 +#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824 msgid ")" msgstr "" -#: lib/rpmchecksig.c:824 +#: lib/rpmchecksig.c:818 msgid "OK" msgstr "" @@ -2883,151 +2883,151 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "No consegui abrir: %s\n" -#: lib/signature.c:119 +#: lib/signature.c:118 msgid "file is not regular -- skipping size check\n" msgstr "" -#: lib/signature.c:128 +#: lib/signature.c:127 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:133 +#: lib/signature.c:132 #, c-format msgid " Actual size: %12d\n" msgstr "" -#: lib/signature.c:153 +#: lib/signature.c:152 msgid "No signature\n" msgstr "" -#: lib/signature.c:157 +#: lib/signature.c:156 #, fuzzy msgid "Old PGP signature\n" msgstr "gere assinatura PGP" -#: lib/signature.c:170 +#: lib/signature.c:167 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "" -#: lib/signature.c:226 +#: lib/signature.c:221 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "" # , c-format -#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678 -#: lib/signature.c:711 +#: lib/signature.c:300 lib/signature.c:397 lib/signature.c:664 +#: lib/signature.c:697 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: lib/signature.c:323 +#: lib/signature.c:316 #, fuzzy msgid "pgp failed\n" msgstr "Construo falhou.\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:330 +#: lib/signature.c:323 #, fuzzy msgid "pgp failed to write signature\n" msgstr "gere assinatura PGP" -#: lib/signature.c:335 +#: lib/signature.c:328 #, c-format msgid "PGP sig size: %d\n" msgstr "" -#: lib/signature.c:351 lib/signature.c:451 +#: lib/signature.c:342 lib/signature.c:440 #, fuzzy msgid "unable to read the signature\n" msgstr "gere assinatura PGP" -#: lib/signature.c:356 +#: lib/signature.c:347 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:423 +#: lib/signature.c:414 #, fuzzy msgid "gpg failed\n" msgstr "Construo falhou.\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:430 +#: lib/signature.c:421 #, fuzzy msgid "gpg failed to write signature\n" msgstr "gere assinatura PGP" -#: lib/signature.c:435 +#: lib/signature.c:426 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:456 +#: lib/signature.c:445 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:716 lib/signature.c:771 +#: lib/signature.c:702 lib/signature.c:753 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:750 +#: lib/signature.c:732 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:763 +#: lib/signature.c:745 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/signature.c:807 +#: lib/signature.c:789 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:847 +#: lib/signature.c:825 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:906 +#: lib/signature.c:873 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1102 +#: lib/signature.c:1059 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "desconsidere quaisquer assinaturas MD5" -#: lib/signature.c:1221 +#: lib/signature.c:1168 msgid "Header " msgstr "" -#: lib/signature.c:1222 +#: lib/signature.c:1169 #, fuzzy msgid "V3 DSA signature: " msgstr "gere assinatura PGP" -#: lib/signature.c:1311 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1338 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1342 +#: lib/signature.c:1275 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:180 +#: lib/transaction.c:173 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3041,34 +3041,26 @@ msgstr "" # "Content-Transfer-Encoding: 8-bit\n" # , c-format #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:985 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "RPM verso %s\n" -#: lib/transaction.c:1085 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:243 -msgid "package lacks both user name and id lists (this should never happen)\n" -msgstr "" - -#: lib/verify.c:264 -msgid "package lacks both group name and id lists (this should never happen)\n" -msgstr "" - -#: lib/verify.c:408 +#: lib/verify.c:324 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:505 +#: lib/verify.c:419 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "lista dependncias do pacote" -#: lib/verify.c:543 +#: lib/verify.c:459 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/ro.po b/po/ro.po index 7d099cc..99f4071 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-03-09 14:38-0500\n" +"POT-Creation-Date: 2002-03-12 11:41-0500\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -810,7 +810,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:618 lib/psm.c:1444 +#: build/pack.c:618 lib/psm.c:1445 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -840,7 +840,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:699 lib/psm.c:1725 +#: build/pack.c:699 lib/psm.c:1726 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1582,46 +1582,46 @@ msgstr "" msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:184 lib/package.c:260 +#: lib/package.c:181 lib/package.c:257 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" -#: lib/package.c:205 lib/package.c:268 +#: lib/package.c:202 lib/package.c:265 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" -#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557 +#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553 #, c-format msgid "%s: readLead failed\n" msgstr "" -#: lib/package.c:252 +#: lib/package.c:249 #, c-format msgid "%s: bad magic\n" msgstr "" -#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573 +#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "" -#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578 +#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574 #, c-format msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:331 lib/rpmchecksig.c:476 +#: lib/package.c:328 lib/rpmchecksig.c:474 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651 +#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505 +#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" @@ -2151,36 +2151,36 @@ msgstr "" msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1351 +#: lib/psm.c:1352 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1494 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1502 +#: lib/psm.c:1503 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1544 +#: lib/psm.c:1545 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1545 +#: lib/psm.c:1546 msgid " on file " msgstr "" -#: lib/psm.c:1733 +#: lib/psm.c:1734 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1736 +#: lib/psm.c:1737 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2317,11 +2317,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:674 +#: lib/rpmal.c:673 msgid "(added files)" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:770 msgid "(added provide)" msgstr "" @@ -2339,57 +2339,57 @@ msgstr "" msgid "%s: Fwrite failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:169 +#: lib/rpmchecksig.c:170 #, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "" -#: lib/rpmchecksig.c:173 +#: lib/rpmchecksig.c:174 #, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "" -#: lib/rpmchecksig.c:253 +#: lib/rpmchecksig.c:254 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:259 +#: lib/rpmchecksig.c:260 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:490 +#: lib/rpmchecksig.c:488 #, c-format msgid "%s: headerGetEntry failed\n" msgstr "" -#: lib/rpmchecksig.c:563 +#: lib/rpmchecksig.c:559 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "" -#: lib/rpmchecksig.c:810 +#: lib/rpmchecksig.c:804 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825 +#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827 +#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821 msgid ") " msgstr "" -#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828 +#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830 +#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824 msgid ")" msgstr "" -#: lib/rpmchecksig.c:824 +#: lib/rpmchecksig.c:818 msgid "OK" msgstr "" @@ -2599,175 +2599,167 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "" -#: lib/signature.c:119 +#: lib/signature.c:118 msgid "file is not regular -- skipping size check\n" msgstr "" -#: lib/signature.c:128 +#: lib/signature.c:127 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:133 +#: lib/signature.c:132 #, c-format msgid " Actual size: %12d\n" msgstr "" -#: lib/signature.c:153 +#: lib/signature.c:152 msgid "No signature\n" msgstr "" -#: lib/signature.c:157 +#: lib/signature.c:156 msgid "Old PGP signature\n" msgstr "" -#: lib/signature.c:170 +#: lib/signature.c:167 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "" -#: lib/signature.c:226 +#: lib/signature.c:221 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "" -#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678 -#: lib/signature.c:711 +#: lib/signature.c:300 lib/signature.c:397 lib/signature.c:664 +#: lib/signature.c:697 #, c-format msgid "Could not exec %s: %s\n" msgstr "" -#: lib/signature.c:323 +#: lib/signature.c:316 msgid "pgp failed\n" msgstr "" #. PGP failed to write signature #. Just in case -#: lib/signature.c:330 +#: lib/signature.c:323 msgid "pgp failed to write signature\n" msgstr "" -#: lib/signature.c:335 +#: lib/signature.c:328 #, c-format msgid "PGP sig size: %d\n" msgstr "" -#: lib/signature.c:351 lib/signature.c:451 +#: lib/signature.c:342 lib/signature.c:440 msgid "unable to read the signature\n" msgstr "" -#: lib/signature.c:356 +#: lib/signature.c:347 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:423 +#: lib/signature.c:414 msgid "gpg failed\n" msgstr "" #. GPG failed to write signature #. Just in case -#: lib/signature.c:430 +#: lib/signature.c:421 msgid "gpg failed to write signature\n" msgstr "" -#: lib/signature.c:435 +#: lib/signature.c:426 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:456 +#: lib/signature.c:445 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:716 lib/signature.c:771 +#: lib/signature.c:702 lib/signature.c:753 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:750 +#: lib/signature.c:732 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:763 +#: lib/signature.c:745 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/signature.c:807 +#: lib/signature.c:789 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:847 +#: lib/signature.c:825 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:906 +#: lib/signature.c:873 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1102 +#: lib/signature.c:1059 msgid "V3 RSA/MD5 signature: " msgstr "" -#: lib/signature.c:1221 +#: lib/signature.c:1168 msgid "Header " msgstr "" -#: lib/signature.c:1222 +#: lib/signature.c:1169 msgid "V3 DSA signature: " msgstr "" -#: lib/signature.c:1311 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1338 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1342 +#: lib/signature.c:1275 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:180 +#: lib/transaction.c:173 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:985 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1085 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:243 -msgid "package lacks both user name and id lists (this should never happen)\n" -msgstr "" - -#: lib/verify.c:264 -msgid "package lacks both group name and id lists (this should never happen)\n" -msgstr "" - -#: lib/verify.c:408 +#: lib/verify.c:324 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:505 +#: lib/verify.c:419 #, c-format msgid "Unsatisifed dependencies for %s: " msgstr "" -#: lib/verify.c:543 +#: lib/verify.c:459 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index eab836d..b3a5450 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-03-09 14:38-0500\n" +"POT-Creation-Date: 2002-03-12 11:41-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -815,7 +815,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:618 lib/psm.c:1444 +#: build/pack.c:618 lib/psm.c:1445 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -845,7 +845,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:699 lib/psm.c:1725 +#: build/pack.c:699 lib/psm.c:1726 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1587,46 +1587,46 @@ msgstr "" msgid "error creating temporary file %s\n" msgstr "" -#: lib/package.c:184 lib/package.c:260 +#: lib/package.c:181 lib/package.c:257 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "" -#: lib/package.c:205 lib/package.c:268 +#: lib/package.c:202 lib/package.c:265 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" -#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557 +#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553 #, c-format msgid "%s: readLead failed\n" msgstr "" -#: lib/package.c:252 +#: lib/package.c:249 #, c-format msgid "%s: bad magic\n" msgstr "" -#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573 +#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "" -#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578 +#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574 #, c-format msgid "%s: No signature available\n" msgstr "" -#: lib/package.c:331 lib/rpmchecksig.c:476 +#: lib/package.c:328 lib/rpmchecksig.c:474 #, c-format msgid "%s: headerRead failed\n" msgstr "" -#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651 +#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505 +#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503 #, c-format msgid "%s: Fread failed: %s\n" msgstr "" @@ -2156,36 +2156,36 @@ msgstr "" msgid "%s: %s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:1351 +#: lib/psm.c:1352 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1494 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1502 +#: lib/psm.c:1503 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1544 +#: lib/psm.c:1545 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1545 +#: lib/psm.c:1546 msgid " on file " msgstr "" -#: lib/psm.c:1733 +#: lib/psm.c:1734 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1736 +#: lib/psm.c:1737 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2322,11 +2322,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:674 +#: lib/rpmal.c:673 msgid "(added files)" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:770 msgid "(added provide)" msgstr "" @@ -2344,57 +2344,57 @@ msgstr "" msgid "%s: Fwrite failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:169 +#: lib/rpmchecksig.c:170 #, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "" -#: lib/rpmchecksig.c:173 +#: lib/rpmchecksig.c:174 #, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "" -#: lib/rpmchecksig.c:253 +#: lib/rpmchecksig.c:254 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:259 +#: lib/rpmchecksig.c:260 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "" -#: lib/rpmchecksig.c:490 +#: lib/rpmchecksig.c:488 #, c-format msgid "%s: headerGetEntry failed\n" msgstr "" -#: lib/rpmchecksig.c:563 +#: lib/rpmchecksig.c:559 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "" -#: lib/rpmchecksig.c:810 +#: lib/rpmchecksig.c:804 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825 +#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819 msgid " (MISSING KEYS:" msgstr "" -#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827 +#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821 msgid ") " msgstr "" -#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828 +#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830 +#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824 msgid ")" msgstr "" -#: lib/rpmchecksig.c:824 +#: lib/rpmchecksig.c:818 msgid "OK" msgstr "" @@ -2604,175 +2604,167 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "" -#: lib/signature.c:119 +#: lib/signature.c:118 msgid "file is not regular -- skipping size check\n" msgstr "" -#: lib/signature.c:128 +#: lib/signature.c:127 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:133 +#: lib/signature.c:132 #, c-format msgid " Actual size: %12d\n" msgstr "" -#: lib/signature.c:153 +#: lib/signature.c:152 msgid "No signature\n" msgstr "" -#: lib/signature.c:157 +#: lib/signature.c:156 msgid "Old PGP signature\n" msgstr "" -#: lib/signature.c:170 +#: lib/signature.c:167 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "" -#: lib/signature.c:226 +#: lib/signature.c:221 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "" -#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678 -#: lib/signature.c:711 +#: lib/signature.c:300 lib/signature.c:397 lib/signature.c:664 +#: lib/signature.c:697 #, c-format msgid "Could not exec %s: %s\n" msgstr "" -#: lib/signature.c:323 +#: lib/signature.c:316 msgid "pgp failed\n" msgstr "" #. PGP failed to write signature #. Just in case -#: lib/signature.c:330 +#: lib/signature.c:323 msgid "pgp failed to write signature\n" msgstr "" -#: lib/signature.c:335 +#: lib/signature.c:328 #, c-format msgid "PGP sig size: %d\n" msgstr "" -#: lib/signature.c:351 lib/signature.c:451 +#: lib/signature.c:342 lib/signature.c:440 msgid "unable to read the signature\n" msgstr "" -#: lib/signature.c:356 +#: lib/signature.c:347 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:423 +#: lib/signature.c:414 msgid "gpg failed\n" msgstr "" #. GPG failed to write signature #. Just in case -#: lib/signature.c:430 +#: lib/signature.c:421 msgid "gpg failed to write signature\n" msgstr "" -#: lib/signature.c:435 +#: lib/signature.c:426 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:456 +#: lib/signature.c:445 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:716 lib/signature.c:771 +#: lib/signature.c:702 lib/signature.c:753 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:750 +#: lib/signature.c:732 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "" -#: lib/signature.c:763 +#: lib/signature.c:745 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "" -#: lib/signature.c:807 +#: lib/signature.c:789 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:847 +#: lib/signature.c:825 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:906 +#: lib/signature.c:873 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1102 +#: lib/signature.c:1059 msgid "V3 RSA/MD5 signature: " msgstr "" -#: lib/signature.c:1221 +#: lib/signature.c:1168 msgid "Header " msgstr "" -#: lib/signature.c:1222 +#: lib/signature.c:1169 msgid "V3 DSA signature: " msgstr "" -#: lib/signature.c:1311 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1338 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1342 +#: lib/signature.c:1275 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:180 +#: lib/transaction.c:173 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:985 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1085 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:243 -msgid "package lacks both user name and id lists (this should never happen)\n" -msgstr "" - -#: lib/verify.c:264 -msgid "package lacks both group name and id lists (this should never happen)\n" -msgstr "" - -#: lib/verify.c:408 +#: lib/verify.c:324 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:505 +#: lib/verify.c:419 #, c-format msgid "Unsatisifed dependencies for %s: " msgstr "" -#: lib/verify.c:543 +#: lib/verify.c:459 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index e5f952c..995432e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-03-09 14:38-0500\n" +"POT-Creation-Date: 2002-03-12 11:41-0500\n" "PO-Revision-Date: 2001-08-29 13:55-0400\n" "Last-Translator: Eugene Kanter \n" "Language-Team: Black Cat Linux Team \n" @@ -835,7 +835,7 @@ msgstr " msgid "Could not open %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: build/pack.c:618 lib/psm.c:1444 +#: build/pack.c:618 lib/psm.c:1445 #, c-format msgid "Unable to write package: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÐÁËÅÔ: %s\n" @@ -865,7 +865,7 @@ msgstr " msgid "Unable to write payload to %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÓÏÄÅÒÖÉÍÏÅ × %s: %s\n" -#: build/pack.c:699 lib/psm.c:1725 +#: build/pack.c:699 lib/psm.c:1726 #, c-format msgid "Wrote: %s\n" msgstr "úÁÐÉÓÁÎ: %s\n" @@ -1631,46 +1631,46 @@ msgstr "%s msgid "error creating temporary file %s\n" msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ %s\n" -#: lib/package.c:184 lib/package.c:260 +#: lib/package.c:181 lib/package.c:257 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "ÐÁËÅÔÙ ×ÅÒÓÉÉ 1 ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ ÜÔÏÊ ×ÅÒÓÉÅÊ RPM\n" -#: lib/package.c:205 lib/package.c:268 +#: lib/package.c:202 lib/package.c:265 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ÐÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ÐÁËÅÔÙ ×ÅÒÓÉÉ <= 4\n" -#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557 +#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553 #, c-format msgid "%s: readLead failed\n" msgstr "%s: ÏÛÉÂËÁ readLead\n" -#: lib/package.c:252 +#: lib/package.c:249 #, fuzzy, c-format msgid "%s: bad magic\n" msgstr "îÅ×ÅÒÎÙÊ magic" -#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573 +#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: ÏÛÉÂËÁ rpmReadSignature\n" -#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578 +#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574 #, c-format msgid "%s: No signature available\n" msgstr "%s: ðÏÄÐÉÓØ ÎÅÄÏÓÔÕÐÎÁ\n" -#: lib/package.c:331 lib/rpmchecksig.c:476 +#: lib/package.c:328 lib/rpmchecksig.c:474 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: ÏÛÉÂËÁ readLead\n" -#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651 +#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505 +#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: ÏÛÉÂËÁ Fread: %s\n" @@ -2225,36 +2225,36 @@ msgstr " msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s-%s-%s ÓÏÄÅÒÖÉÔ %d ÆÁÊÌÏ×, test = %d\n" -#: lib/psm.c:1351 +#: lib/psm.c:1352 #, fuzzy, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: ÏÛÉÂËÁ ÓÃÅÎÁÒÉÑ %s (%d), %s-%s-%s ÐÒÏÐÕÓËÁÅÔÓÑ\n" -#: lib/psm.c:1493 +#: lib/psm.c:1494 #, c-format msgid "user %s does not exist - using root\n" msgstr "ÐÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:1502 +#: lib/psm.c:1503 #, c-format msgid "group %s does not exist - using root\n" msgstr "ÇÒÕÐÐÁ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:1544 +#: lib/psm.c:1545 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "ÒÁÓÐÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s\n" -#: lib/psm.c:1545 +#: lib/psm.c:1546 msgid " on file " msgstr " ÎÁ ÆÁÊÌÅ " -#: lib/psm.c:1733 +#: lib/psm.c:1734 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ÏÛÉÂËÁ ÎÁ ÆÁÊÌÅ %s: %s\n" -#: lib/psm.c:1736 +#: lib/psm.c:1737 #, c-format msgid "%s failed: %s\n" msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n" @@ -2391,12 +2391,12 @@ msgstr " msgid "package %s is not installed\n" msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" -#: lib/rpmal.c:674 +#: lib/rpmal.c:673 #, fuzzy msgid "(added files)" msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:770 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s YES (db provides)\n" @@ -2415,57 +2415,57 @@ msgstr " msgid "%s: Fwrite failed: %s\n" msgstr "%s: ÏÛÉÂËÁ Fwrite: %s\n" -#: lib/rpmchecksig.c:169 +#: lib/rpmchecksig.c:170 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: îÅ ÍÏÇÕ ÐÏÄÐÉÓÁÔØ RPM v1.0\n" -#: lib/rpmchecksig.c:173 +#: lib/rpmchecksig.c:174 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: îÅ ÍÏÇÕ ÐÅÒÅÐÏÄÐÉÓÁÔØ RPM v2.0\n" -#: lib/rpmchecksig.c:253 +#: lib/rpmchecksig.c:254 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: ÏÛÉÂËÁ writeLead: %s\n" -#: lib/rpmchecksig.c:259 +#: lib/rpmchecksig.c:260 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: ÏÛÉÂËÁ rpmWriteSignature: %s\n" -#: lib/rpmchecksig.c:490 +#: lib/rpmchecksig.c:488 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: ÏÛÉÂËÁ readLead\n" -#: lib/rpmchecksig.c:563 +#: lib/rpmchecksig.c:559 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: ðÏÄÐÉÓÉ ÎÅÔ (RPM v1.0)\n" -#: lib/rpmchecksig.c:810 +#: lib/rpmchecksig.c:804 msgid "NOT OK" msgstr "îå Oë" -#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825 +#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819 msgid " (MISSING KEYS:" msgstr " (ïôóõôóô÷õàô ëìàþé:" -#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827 +#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828 +#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822 msgid " (UNTRUSTED KEYS:" msgstr " (îåô äï÷åòéñ ë ëìàþáí:" -#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830 +#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:824 +#: lib/rpmchecksig.c:818 msgid "OK" msgstr "Oë" @@ -2677,183 +2677,171 @@ msgstr " msgid "Unable to open %s for reading: %s.\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ: %s.\n" -#: lib/signature.c:119 +#: lib/signature.c:118 msgid "file is not regular -- skipping size check\n" msgstr "ÎÅÏÂÙÞÎÙÊ ÆÁÊÌ -- ÐÒÏÐÕÓËÁÀ ÐÒÏ×ÅÒËÕ ÒÁÚÍÅÒÁ\n" -#: lib/signature.c:128 +#: lib/signature.c:127 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "ïÖÉÄÁÅÍÙÊ ÒÁÚÍÅÒ: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" -#: lib/signature.c:133 +#: lib/signature.c:132 #, c-format msgid " Actual size: %12d\n" msgstr "æÁËÔÉÞÅÓËÉÊ ÒÁÚÍÅÒ: %12d\n" -#: lib/signature.c:153 +#: lib/signature.c:152 msgid "No signature\n" msgstr "ðÏÄÐÉÓÉ ÎÅÔ\n" -#: lib/signature.c:157 +#: lib/signature.c:156 msgid "Old PGP signature\n" msgstr "óÔÁÒÁÑ ÐÏÄÐÉÓØ PGP\n" -#: lib/signature.c:170 +#: lib/signature.c:167 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "" "óÔÁÒÁÑ (ÔÏÌØËÏ ÄÌÑ ×ÎÕÔÒÅÎÎÅÇÏ ÉÓÐÏÌØÚÏ×ÁÎÉÑ) ÐÏÄÐÉÓØ! çÄÅ ×Ù üôï ×ÚÑÌÉ!?\n" -#: lib/signature.c:226 +#: lib/signature.c:221 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "ðÏÄÐÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁÐÏÌÎÅÎÉÅ(%d)\n" -#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678 -#: lib/signature.c:711 +#: lib/signature.c:300 lib/signature.c:397 lib/signature.c:664 +#: lib/signature.c:697 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÌÎÉÔØ %s: %s\n" -#: lib/signature.c:323 +#: lib/signature.c:316 msgid "pgp failed\n" msgstr "ÏÛÉÂËÁ pgp\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:330 +#: lib/signature.c:323 msgid "pgp failed to write signature\n" msgstr "ÏÛÉÂËÁ pgp ÐÒÉ ÚÁÐÉÓÉ ÐÏÄÐÉÓÉ\n" -#: lib/signature.c:335 +#: lib/signature.c:328 #, c-format msgid "PGP sig size: %d\n" msgstr "òÁÚÍÅÒ ÐÏÄÐÉÓÉ PGP: %d\n" -#: lib/signature.c:351 lib/signature.c:451 +#: lib/signature.c:342 lib/signature.c:440 msgid "unable to read the signature\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ ÐÏÄÐÉÓØ\n" -#: lib/signature.c:356 +#: lib/signature.c:347 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "ðÏÌÕÞÅÎÏ %d ÂÁÊÔ ÐÏÄÐÉÓÉ PGP\n" -#: lib/signature.c:423 +#: lib/signature.c:414 msgid "gpg failed\n" msgstr "ÏÛÉÂËÁ gpg\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:430 +#: lib/signature.c:421 msgid "gpg failed to write signature\n" msgstr "ÏÛÉÂËÁ gpg ÐÒÉ ÚÁÐÉÓÉ ÐÏÄÐÉÓÉ\n" -#: lib/signature.c:435 +#: lib/signature.c:426 #, c-format msgid "GPG sig size: %d\n" msgstr "òÁÚÍÅÒ ÐÏÄÐÉÓÉ GPG: %d\n" -#: lib/signature.c:456 +#: lib/signature.c:445 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "ðÏÌÕÞÅÎÏ %d ÂÁÊÔ ÐÏÄÐÉÓÉ GPG\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:716 lib/signature.c:771 +#: lib/signature.c:702 lib/signature.c:753 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "îÅ×ÅÒÎÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ %%_signature × ÍÁËÒÏÆÁÊÌÅ\n" -#: lib/signature.c:750 +#: lib/signature.c:732 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_gpg_name\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ\n" -#: lib/signature.c:763 +#: lib/signature.c:745 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_pgp_name\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ\n" -#: lib/signature.c:807 +#: lib/signature.c:789 #, fuzzy msgid "Header+Payload size: " msgstr "úÁÇÏÌÏ×ÏË ÓÌÉÛËÏÍ ×ÅÌÉË" -#: lib/signature.c:847 +#: lib/signature.c:825 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:906 +#: lib/signature.c:873 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1102 +#: lib/signature.c:1059 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "ÐÒÏÐÕÓÔÉÔØ ×ÓÅ MD5-ÐÏÄÐÉÓÉ" -#: lib/signature.c:1221 +#: lib/signature.c:1168 msgid "Header " msgstr "" -#: lib/signature.c:1222 +#: lib/signature.c:1169 #, fuzzy msgid "V3 DSA signature: " msgstr "ðÏÄÐÉÓÉ ÎÅÔ\n" -#: lib/signature.c:1311 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1338 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1342 +#: lib/signature.c:1275 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "ðÏÄÐÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁÐÏÌÎÅÎÉÅ(%d)\n" -#: lib/transaction.c:180 +#: lib/transaction.c:173 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ÐÒÏÐÕÝÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:985 #, c-format msgid "excluding directory %s\n" msgstr "ÉÓËÌÀÞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: lib/transaction.c:1085 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "ÐÏÌÕÞÅÎÉÅ ÓÐÉÓËÁ ÓÍÏÎÔÉÒÏ×ÁÎÎÙÈ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ\n" -#: lib/verify.c:243 -msgid "package lacks both user name and id lists (this should never happen)\n" -msgstr "" -"× ÐÁËÅÔÅ ÎÅÔ ÎÉ ÉÍÅÎ ÐÏÌØÚÏ×ÁÔÅÌÅÊ, ÎÉ ÓÐÉÓËÁ ÉÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× (ÔÁËÏÇÏ ÎÅ " -"ÄÏÌÖÎÏ ÂÙÔØ)\n" - -#: lib/verify.c:264 -msgid "package lacks both group name and id lists (this should never happen)\n" -msgstr "" -"× ÐÁËÅÔÅ ÎÅÔ ÎÉ ÉÍÅÎ ÇÒÕÐÐ, ÎÉ ÓÐÉÓËÁ ÉÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× (ÔÁËÏÇÏ ÎÅ ÄÏÌÖÎÏ " -"ÂÙÔØ)\n" - -#: lib/verify.c:408 +#: lib/verify.c:324 #, c-format msgid "missing %s" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ %s" -#: lib/verify.c:505 +#: lib/verify.c:419 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: " -#: lib/verify.c:543 +#: lib/verify.c:459 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "%s-%s-%s: ÎÅÐÒÁ×ÉÌØÎÁÑ ÐÏÄÐÉÓØ ÏÂÌÁÓÔÉ ÚÁÇÏÌÏ×ËÁ ÐÁËÅÔÁ\n" @@ -3453,6 +3441,18 @@ msgstr "url msgid "failed to create %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n" +#~ msgid "" +#~ "package lacks both user name and id lists (this should never happen)\n" +#~ msgstr "" +#~ "× ÐÁËÅÔÅ ÎÅÔ ÎÉ ÉÍÅÎ ÐÏÌØÚÏ×ÁÔÅÌÅÊ, ÎÉ ÓÐÉÓËÁ ÉÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× (ÔÁËÏÇÏ " +#~ "ÎÅ ÄÏÌÖÎÏ ÂÙÔØ)\n" + +#~ msgid "" +#~ "package lacks both group name and id lists (this should never happen)\n" +#~ msgstr "" +#~ "× ÐÁËÅÔÅ ÎÅÔ ÎÉ ÉÍÅÎ ÇÒÕÐÐ, ÎÉ ÓÐÉÓËÁ ÉÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× (ÔÁËÏÇÏ ÎÅ " +#~ "ÄÏÌÖÎÏ ÂÙÔØ)\n" + #, fuzzy #~ msgid "sign a package, discarding all current signatures" #~ msgstr "ÐÏÄÐÉÓÁÔØ ÐÁËÅÔ (ÕÄÁÌÉ× ÔÅËÕÝÕÀ ÐÏÄÐÉÓØ)" diff --git a/po/sk.po b/po/sk.po index af1aa74..a10b71d 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-03-09 14:38-0500\n" +"POT-Creation-Date: 2002-03-12 11:41-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -850,7 +850,7 @@ msgstr "Nie je mo msgid "Could not open %s: %s\n" msgstr "Otvorenie %s zlyhalo\n" -#: build/pack.c:618 lib/psm.c:1444 +#: build/pack.c:618 lib/psm.c:1445 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nie je mo¾né zapísa» balík: %s" @@ -880,7 +880,7 @@ msgstr "Nie je mo msgid "Unable to write payload to %s: %s\n" msgstr "Nie je mo¾né zapísa» balík: %s" -#: build/pack.c:699 lib/psm.c:1725 +#: build/pack.c:699 lib/psm.c:1726 #, c-format msgid "Wrote: %s\n" msgstr "Zapísané: %s\n" @@ -1650,48 +1650,48 @@ msgstr "varovanie: %s vytvoren msgid "error creating temporary file %s\n" msgstr "chyba pri vytváraní doèasného súboru %s" -#: lib/package.c:184 lib/package.c:260 +#: lib/package.c:181 lib/package.c:257 #, fuzzy msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "táto verzia RPM podporuje iba balíky s hlavným èíslom <= 3" -#: lib/package.c:205 lib/package.c:268 +#: lib/package.c:202 lib/package.c:265 #, fuzzy msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "táto verzia RPM podporuje iba balíky s hlavným èíslom <= 3" -#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557 +#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553 #, c-format msgid "%s: readLead failed\n" msgstr "%s: readLead zlyhalo\n" -#: lib/package.c:252 +#: lib/package.c:249 #, fuzzy, c-format msgid "%s: bad magic\n" msgstr "Chybné magické èíslo" -#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573 +#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature zlyhalo\n" -#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578 +#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574 #, c-format msgid "%s: No signature available\n" msgstr "%s: Podpis nie je k dispozícii\n" -#: lib/package.c:331 lib/rpmchecksig.c:476 +#: lib/package.c:328 lib/rpmchecksig.c:474 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead zlyhalo\n" -#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651 +#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505 +#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: readLead zlyhalo\n" @@ -2275,36 +2275,36 @@ msgstr "vykonanie skriptu zlyhalo" msgid "%s: %s has %d files, test = %d\n" msgstr "balík: %s-%s-%s test súborov = %d\n" -#: lib/psm.c:1351 +#: lib/psm.c:1352 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1494 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "pou¾ívateµ %s neexistuje - pou¾ije sa root" -#: lib/psm.c:1502 +#: lib/psm.c:1503 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ije sa root" -#: lib/psm.c:1544 +#: lib/psm.c:1545 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalenie archívu zlyhalo%s%s: %s" -#: lib/psm.c:1545 +#: lib/psm.c:1546 msgid " on file " msgstr " pre súbor " -#: lib/psm.c:1733 +#: lib/psm.c:1734 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nepodarilo sa otvori» %s: %s" -#: lib/psm.c:1736 +#: lib/psm.c:1737 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s zlyhalo" @@ -2443,12 +2443,12 @@ msgstr "z msgid "package %s is not installed\n" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/rpmal.c:674 +#: lib/rpmal.c:673 #, fuzzy msgid "(added files)" msgstr "chybný stav súboru: %s" -#: lib/rpmal.c:771 +#: lib/rpmal.c:770 #, fuzzy msgid "(added provide)" msgstr "Poskytuje:" @@ -2468,57 +2468,57 @@ msgstr "vykonanie zlyhalo\n" msgid "%s: Fwrite failed: %s\n" msgstr "%s: readLead zlyhalo\n" -#: lib/rpmchecksig.c:169 +#: lib/rpmchecksig.c:170 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: Nie je mo¾né podpísa» v1.0 RPM\n" -#: lib/rpmchecksig.c:173 +#: lib/rpmchecksig.c:174 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: Nie je mo¾né znovu podpísa» v2.0 RPM\n" -#: lib/rpmchecksig.c:253 +#: lib/rpmchecksig.c:254 #, fuzzy, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: readLead zlyhalo\n" -#: lib/rpmchecksig.c:259 +#: lib/rpmchecksig.c:260 #, fuzzy, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmReadSignature zlyhalo\n" -#: lib/rpmchecksig.c:490 +#: lib/rpmchecksig.c:488 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead zlyhalo\n" -#: lib/rpmchecksig.c:563 +#: lib/rpmchecksig.c:559 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Podpis nie je k dispozícii (v1.0 RPM)\n" -#: lib/rpmchecksig.c:810 +#: lib/rpmchecksig.c:804 msgid "NOT OK" msgstr "NIE JE V PORIADKU" -#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825 +#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819 msgid " (MISSING KEYS:" msgstr " (CHÝBAJÚCE K¥ÚÈE):" -#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827 +#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828 +#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822 msgid " (UNTRUSTED KEYS:" msgstr " (NEDÔVERUJE SA K¥ÚÈOM: " -#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830 +#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:824 +#: lib/rpmchecksig.c:818 msgid "OK" msgstr "V PORIADKU" @@ -2729,190 +2729,176 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Nie je mo¾né otvori» %s pre èítanie: %s." -#: lib/signature.c:119 +#: lib/signature.c:118 msgid "file is not regular -- skipping size check\n" msgstr "nejde o be¾ný súbor - kontrola veµkosti vynechaná\n" -#: lib/signature.c:128 +#: lib/signature.c:127 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:133 +#: lib/signature.c:132 #, fuzzy, c-format msgid " Actual size: %12d\n" msgstr "Veµkos» podpisu: %d\n" -#: lib/signature.c:153 +#: lib/signature.c:152 msgid "No signature\n" msgstr "Podpis nie je k dispozícii\n" -#: lib/signature.c:157 +#: lib/signature.c:156 msgid "Old PGP signature\n" msgstr "Starý PGP podpis\n" -#: lib/signature.c:170 +#: lib/signature.c:167 #, fuzzy msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "Starý (iba interný) podpis! Ako ste sa k tomu dostali?!" -#: lib/signature.c:226 +#: lib/signature.c:221 #, fuzzy, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "Veµkos» podpisu: %d\n" -#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678 -#: lib/signature.c:711 +#: lib/signature.c:300 lib/signature.c:397 lib/signature.c:664 +#: lib/signature.c:697 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Nie je mo¾né spusti» %s" -#: lib/signature.c:323 +#: lib/signature.c:316 #, fuzzy msgid "pgp failed\n" msgstr "pgp zlyhalo" #. PGP failed to write signature #. Just in case -#: lib/signature.c:330 +#: lib/signature.c:323 #, fuzzy msgid "pgp failed to write signature\n" msgstr "pgp sa nepodarilo zapísa» podpis" -#: lib/signature.c:335 +#: lib/signature.c:328 #, c-format msgid "PGP sig size: %d\n" msgstr "Veµkos» PGP podpisu: %d\n" -#: lib/signature.c:351 lib/signature.c:451 +#: lib/signature.c:342 lib/signature.c:440 #, fuzzy msgid "unable to read the signature\n" msgstr "nie je mo¾né preèíta» podpis" -#: lib/signature.c:356 +#: lib/signature.c:347 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "Preèítaný PGP podpis obsahuje %d bajtov\n" -#: lib/signature.c:423 +#: lib/signature.c:414 #, fuzzy msgid "gpg failed\n" msgstr "gpg zlyhalo" #. GPG failed to write signature #. Just in case -#: lib/signature.c:430 +#: lib/signature.c:421 #, fuzzy msgid "gpg failed to write signature\n" msgstr "gpg sa nepodarilo zapísa» podpis" -#: lib/signature.c:435 +#: lib/signature.c:426 #, c-format msgid "GPG sig size: %d\n" msgstr "Veµkos» GPG podpisu: %d\n" -#: lib/signature.c:456 +#: lib/signature.c:445 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "Preèítaný GPG podpis obsahuje %d bajtov\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:716 lib/signature.c:771 +#: lib/signature.c:702 lib/signature.c:753 #, fuzzy, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "Chybná ¹pecifikácia %%_signature v makro-súbore.\n" -#: lib/signature.c:750 +#: lib/signature.c:732 #, fuzzy, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Musíte nastavi» \"%%gpg_name\" vo va¹om makro-súbore" -#: lib/signature.c:763 +#: lib/signature.c:745 #, fuzzy, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Musíte nastavi» \"%%pgp_name\" vo va¹om makro-súbore" -#: lib/signature.c:807 +#: lib/signature.c:789 #, fuzzy msgid "Header+Payload size: " msgstr "Priveµká hlavièka" -#: lib/signature.c:847 +#: lib/signature.c:825 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:906 +#: lib/signature.c:873 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1102 +#: lib/signature.c:1059 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "vynecha» akékoµvek MD5 podpisy" -#: lib/signature.c:1221 +#: lib/signature.c:1168 msgid "Header " msgstr "" -#: lib/signature.c:1222 +#: lib/signature.c:1169 #, fuzzy msgid "V3 DSA signature: " msgstr "Podpis nie je k dispozícii\n" -#: lib/signature.c:1311 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1338 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1342 +#: lib/signature.c:1275 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Doplnenie podpisu: %d\n" -#: lib/transaction.c:180 +#: lib/transaction.c:173 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s vynechané kvôli príznaku missingok\n" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:985 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "vytvára sa adresár %s\n" -#: lib/transaction.c:1085 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:243 -#, fuzzy -msgid "package lacks both user name and id lists (this should never happen)\n" -msgstr "" -"v balíku chýba tak meno pou¾ívateµa, ako aj zoznamy identifikácií (nemalo by " -"sa nikdy sta»)" - -#: lib/verify.c:264 -#, fuzzy -msgid "package lacks both group name and id lists (this should never happen)\n" -msgstr "" -"v balíku chýba tak meno skupiny, ako aj zoznamy identifikácií (nemalo by sa " -"nikdy sta»)" - -#: lib/verify.c:408 +#: lib/verify.c:324 #, fuzzy, c-format msgid "missing %s" msgstr "chýbajúce %s\n" -#: lib/verify.c:505 +#: lib/verify.c:419 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: " -#: lib/verify.c:543 +#: lib/verify.c:459 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3514,6 +3500,20 @@ msgid "failed to create %s: %s\n" msgstr "nepodarilo sa vytvori» %s\n" #, fuzzy +#~ msgid "" +#~ "package lacks both user name and id lists (this should never happen)\n" +#~ msgstr "" +#~ "v balíku chýba tak meno pou¾ívateµa, ako aj zoznamy identifikácií (nemalo " +#~ "by sa nikdy sta»)" + +#, fuzzy +#~ msgid "" +#~ "package lacks both group name and id lists (this should never happen)\n" +#~ msgstr "" +#~ "v balíku chýba tak meno skupiny, ako aj zoznamy identifikácií (nemalo by " +#~ "sa nikdy sta»)" + +#, fuzzy #~ msgid "========== Header RSA signature\n" #~ msgstr "Nová hlavièka podpisu\n" diff --git a/po/sl.po b/po/sl.po index e308d51..5fc0b9d 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,12 +1,12 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primo¾ Peterlin , 2000. -# $Id: sl.po,v 1.230 2002/03/10 15:18:39 jbj Exp $ +# $Id: sl.po,v 1.231 2002/03/12 16:56:58 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-03-09 14:38-0500\n" +"POT-Creation-Date: 2002-03-12 11:41-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -848,7 +848,7 @@ msgstr "Ikone %s ni mo msgid "Could not open %s: %s\n" msgstr "Ni mo¾no odpreti %s: %s\n" -#: build/pack.c:618 lib/psm.c:1444 +#: build/pack.c:618 lib/psm.c:1445 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Ni mo¾no zapisati paketa: %s" @@ -878,7 +878,7 @@ msgstr "Ikone %s ni mo msgid "Unable to write payload to %s: %s\n" msgstr "Ni mo¾no zapisati paketa %s: %s" -#: build/pack.c:699 lib/psm.c:1725 +#: build/pack.c:699 lib/psm.c:1726 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -1651,48 +1651,48 @@ msgstr "opozorilo: %s ustvarjen kot %s" msgid "error creating temporary file %s\n" msgstr "napaka pri ustvarjanju zaèasne datoteke %s" -#: lib/package.c:184 lib/package.c:260 +#: lib/package.c:181 lib/package.c:257 #, fuzzy msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <= 3" -#: lib/package.c:205 lib/package.c:268 +#: lib/package.c:202 lib/package.c:265 #, fuzzy msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <=4" -#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557 +#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553 #, c-format msgid "%s: readLead failed\n" msgstr "%s: readLead je bil neuspe¹en\n" -#: lib/package.c:252 +#: lib/package.c:249 #, fuzzy, c-format msgid "%s: bad magic\n" msgstr "Napaèno magièno ¹tevilo" -#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573 +#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature je bil neuspe¹en\n" -#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578 +#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574 #, c-format msgid "%s: No signature available\n" msgstr "%s: Podpis ni na voljo\n" -#: lib/package.c:331 lib/rpmchecksig.c:476 +#: lib/package.c:328 lib/rpmchecksig.c:474 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead je bil neuspe¹en\n" -#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651 +#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505 +#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: branje Fread je bilo neuspe¹no: %s\n" @@ -2274,36 +2274,36 @@ msgstr "skript se ni uspe msgid "%s: %s has %d files, test = %d\n" msgstr "paket: %s-%s-%s datoteke test = %d\n" -#: lib/psm.c:1351 +#: lib/psm.c:1352 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1494 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "uporabnik %s ne obstaja - uporabljam root" -#: lib/psm.c:1502 +#: lib/psm.c:1503 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s ne obstaja - uporabljam root" -#: lib/psm.c:1544 +#: lib/psm.c:1545 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "raz¹iritev arhiva je bilo neuspe¹no%s%s: %s" -#: lib/psm.c:1545 +#: lib/psm.c:1546 msgid " on file " msgstr " za datoteko " -#: lib/psm.c:1733 +#: lib/psm.c:1734 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspe¹no odpiranje %s: %s\n" -#: lib/psm.c:1736 +#: lib/psm.c:1737 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s neuspe¹en" @@ -2442,12 +2442,12 @@ msgstr "zapisa %d ni mo msgid "package %s is not installed\n" msgstr "paket %s ni name¹èen\n" -#: lib/rpmal.c:674 +#: lib/rpmal.c:673 #, fuzzy msgid "(added files)" msgstr "po¹kodovana zbirka podatkov %s" -#: lib/rpmal.c:771 +#: lib/rpmal.c:770 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s DA (db ponudbe)\n" @@ -2466,57 +2466,57 @@ msgstr "makeTempFile je bil neuspe msgid "%s: Fwrite failed: %s\n" msgstr "%s: pisanje Fwrite je bilo neuspe¹no: %s\n" -#: lib/rpmchecksig.c:169 +#: lib/rpmchecksig.c:170 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: Podpis RPM v1.0 ni mo¾en\n" -#: lib/rpmchecksig.c:173 +#: lib/rpmchecksig.c:174 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: Sprememba podpisa RPM v2.0 ni mo¾na\n" -#: lib/rpmchecksig.c:253 +#: lib/rpmchecksig.c:254 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: writeLead je bil neuspe¹en: %s\n" -#: lib/rpmchecksig.c:259 +#: lib/rpmchecksig.c:260 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignature je bilo neuspe¹no: %s\n" -#: lib/rpmchecksig.c:490 +#: lib/rpmchecksig.c:488 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead je bil neuspe¹en\n" -#: lib/rpmchecksig.c:563 +#: lib/rpmchecksig.c:559 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Podpis ni na voljo (RPM v1.0)\n" -#: lib/rpmchecksig.c:810 +#: lib/rpmchecksig.c:804 msgid "NOT OK" msgstr "NI DOBRO" -#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825 +#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819 msgid " (MISSING KEYS:" msgstr " (MANJKAJOÈI KLJUÈI:" -#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827 +#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828 +#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822 msgid " (UNTRUSTED KEYS:" msgstr " (NEPREVERJENI KLJUÈI:" -#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830 +#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:824 +#: lib/rpmchecksig.c:818 msgid "OK" msgstr "V REDU" @@ -2729,188 +2729,176 @@ msgstr "Ni mo msgid "Unable to open %s for reading: %s.\n" msgstr "%s ni mo¾no odpreti za branje: %s." -#: lib/signature.c:119 +#: lib/signature.c:118 msgid "file is not regular -- skipping size check\n" msgstr "datoteka ni navadna datoteka -- preskakujemo preverjanje velikosti\n" -#: lib/signature.c:128 +#: lib/signature.c:127 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:133 +#: lib/signature.c:132 #, fuzzy, c-format msgid " Actual size: %12d\n" msgstr "Dol¾. podpisa : %d\n" -#: lib/signature.c:153 +#: lib/signature.c:152 msgid "No signature\n" msgstr "Podpis manjka\n" -#: lib/signature.c:157 +#: lib/signature.c:156 msgid "Old PGP signature\n" msgstr "Stari podpis PGP\n" -#: lib/signature.c:170 +#: lib/signature.c:167 #, fuzzy msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "Podpis v (interni) stari obliki! Kje ste ga dobili?" -#: lib/signature.c:226 +#: lib/signature.c:221 #, fuzzy, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "Dol¾. podpisa : %d\n" -#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678 -#: lib/signature.c:711 +#: lib/signature.c:300 lib/signature.c:397 lib/signature.c:664 +#: lib/signature.c:697 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Ni mo¾no izvesti %s: %s" -#: lib/signature.c:323 +#: lib/signature.c:316 #, fuzzy msgid "pgp failed\n" msgstr "pgp je bil neuspe¹en" #. PGP failed to write signature #. Just in case -#: lib/signature.c:330 +#: lib/signature.c:323 #, fuzzy msgid "pgp failed to write signature\n" msgstr "pgp je bil neuspe¹en pri zapisu podpisa" -#: lib/signature.c:335 +#: lib/signature.c:328 #, c-format msgid "PGP sig size: %d\n" msgstr "Dol¾. podpisa PGP: %d\n" -#: lib/signature.c:351 lib/signature.c:451 +#: lib/signature.c:342 lib/signature.c:440 #, fuzzy msgid "unable to read the signature\n" msgstr "branje podpisa je bilo neuspe¹no" -#: lib/signature.c:356 +#: lib/signature.c:347 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "Prebrano %d bajtov podpisa PGP\n" -#: lib/signature.c:423 +#: lib/signature.c:414 #, fuzzy msgid "gpg failed\n" msgstr "gpg je bil neuspe¹en" #. GPG failed to write signature #. Just in case -#: lib/signature.c:430 +#: lib/signature.c:421 #, fuzzy msgid "gpg failed to write signature\n" msgstr "gpg je boil neuspe¹en pri zapisu podpisa" -#: lib/signature.c:435 +#: lib/signature.c:426 #, c-format msgid "GPG sig size: %d\n" msgstr "Dol¾. podpisa GnuPG: %d\n" -#: lib/signature.c:456 +#: lib/signature.c:445 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "Prebrano %d bajtov podpisa GnuPG\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:716 lib/signature.c:771 +#: lib/signature.c:702 lib/signature.c:753 #, fuzzy, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "Neveljaven %%_signature v makro-datoteki.\n" -#: lib/signature.c:750 +#: lib/signature.c:732 #, fuzzy, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\"" -#: lib/signature.c:763 +#: lib/signature.c:745 #, fuzzy, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\"" -#: lib/signature.c:807 +#: lib/signature.c:789 #, fuzzy msgid "Header+Payload size: " msgstr "Glava je predolga" -#: lib/signature.c:847 +#: lib/signature.c:825 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:906 +#: lib/signature.c:873 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1102 +#: lib/signature.c:1059 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "preskoèi vse podpise MD5" -#: lib/signature.c:1221 +#: lib/signature.c:1168 msgid "Header " msgstr "" -#: lib/signature.c:1222 +#: lib/signature.c:1169 #, fuzzy msgid "V3 DSA signature: " msgstr "Podpis manjka\n" -#: lib/signature.c:1311 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1338 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1342 +#: lib/signature.c:1275 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Dol¾. polnila : %d\n" -#: lib/transaction.c:180 +#: lib/transaction.c:173 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s preskoèen zaradi manjkajoèe zastavice OK\n" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:985 #, c-format msgid "excluding directory %s\n" msgstr "izkljuèevanje imenika %s\n" -#: lib/transaction.c:1085 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "zbiranje seznama priklopljenih datoteènih sistemov.\n" -#: lib/verify.c:243 -#, fuzzy -msgid "package lacks both user name and id lists (this should never happen)\n" -msgstr "" -"v paketu manjka tako seznam uporabnikov kot identitet (to se ne sme zgoditi)" - -#: lib/verify.c:264 -#, fuzzy -msgid "package lacks both group name and id lists (this should never happen)\n" -msgstr "" -"v paketu manjka tako seznam skupin kot identitet (to se ne sme zgoditi)" - -#: lib/verify.c:408 +#: lib/verify.c:324 #, fuzzy, c-format msgid "missing %s" msgstr "manjka %s\n" -#: lib/verify.c:505 +#: lib/verify.c:419 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: " -#: lib/verify.c:543 +#: lib/verify.c:459 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3519,6 +3507,19 @@ msgid "failed to create %s: %s\n" msgstr "neuspe¹no ustvarjanje %s: %s\n" #, fuzzy +#~ msgid "" +#~ "package lacks both user name and id lists (this should never happen)\n" +#~ msgstr "" +#~ "v paketu manjka tako seznam uporabnikov kot identitet (to se ne sme " +#~ "zgoditi)" + +#, fuzzy +#~ msgid "" +#~ "package lacks both group name and id lists (this should never happen)\n" +#~ msgstr "" +#~ "v paketu manjka tako seznam skupin kot identitet (to se ne sme zgoditi)" + +#, fuzzy #~ msgid "========== Header RSA signature\n" #~ msgstr "Podpis v novi glavi\n" diff --git a/po/sr.po b/po/sr.po index 6e9f81a..0e5dcb3 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-03-09 14:38-0500\n" +"POT-Creation-Date: 2002-03-12 11:41-0500\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" @@ -833,7 +833,7 @@ msgstr "Ne mogu da upi msgid "Could not open %s: %s\n" msgstr "neuspelo otvaranje %s\n" -#: build/pack.c:618 lib/psm.c:1444 +#: build/pack.c:618 lib/psm.c:1445 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Ne mogu da upi¹em %s" @@ -863,7 +863,7 @@ msgstr "Ne mogu da upi msgid "Unable to write payload to %s: %s\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:699 lib/psm.c:1725 +#: build/pack.c:699 lib/psm.c:1726 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1634,48 +1634,48 @@ 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:184 lib/package.c:260 +#: lib/package.c:181 lib/package.c:257 #, fuzzy msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a" -#: lib/package.c:205 lib/package.c:268 +#: lib/package.c:202 lib/package.c:265 #, fuzzy msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a" -#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557 +#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553 #, c-format msgid "%s: readLead failed\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/package.c:252 +#: lib/package.c:249 #, c-format msgid "%s: bad magic\n" msgstr "" -#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573 +#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: Neuspelo 'rpmReadSignature'\n" -#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578 +#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574 #, c-format msgid "%s: No signature available\n" msgstr "%s: Potpis nije na raspolaganju\n" -#: lib/package.c:331 lib/rpmchecksig.c:476 +#: lib/package.c:328 lib/rpmchecksig.c:474 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651 +#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505 +#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503 #, fuzzy, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Neuspeo 'readLead'\n" @@ -2259,36 +2259,36 @@ msgstr "neuspelo izvr msgid "%s: %s has %d files, test = %d\n" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/psm.c:1351 +#: lib/psm.c:1352 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1493 +#: lib/psm.c:1494 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1502 +#: lib/psm.c:1503 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/psm.c:1544 +#: lib/psm.c:1545 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/psm.c:1545 +#: lib/psm.c:1546 msgid " on file " msgstr "" -#: lib/psm.c:1733 +#: lib/psm.c:1734 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/psm.c:1736 +#: lib/psm.c:1737 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "PGP omanuo" @@ -2428,12 +2428,12 @@ msgstr "ne mogu da pro msgid "package %s is not installed\n" msgstr "paket %s nije instaliran\n" -#: lib/rpmal.c:674 +#: lib/rpmal.c:673 #, fuzzy msgid "(added files)" msgstr "neuspelo otvaranje %s: %s" -#: lib/rpmal.c:771 +#: lib/rpmal.c:770 #, fuzzy msgid "(added provide)" msgstr "datoteka %s ne pripada nijednom paketu\n" @@ -2453,58 +2453,58 @@ msgstr "%s: Neuspelo otvaranje\n" msgid "%s: Fwrite failed: %s\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/rpmchecksig.c:169 +#: lib/rpmchecksig.c:170 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: Ne mogu da potpi¹em v1.0 RPM\n" -#: lib/rpmchecksig.c:173 +#: lib/rpmchecksig.c:174 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: Ne mogu da ponovo potpi¹em v2.0 RPM\n" -#: lib/rpmchecksig.c:253 +#: lib/rpmchecksig.c:254 #, fuzzy, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/rpmchecksig.c:259 +#: lib/rpmchecksig.c:260 #, fuzzy, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: Neuspelo 'rpmReadSignature'\n" -#: lib/rpmchecksig.c:490 +#: lib/rpmchecksig.c:488 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/rpmchecksig.c:563 +#: lib/rpmchecksig.c:559 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Potpis nije na raspolaganju (RPM v1.0)\n" -#: lib/rpmchecksig.c:810 +#: lib/rpmchecksig.c:804 msgid "NOT OK" msgstr "" -#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825 +#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819 #, fuzzy msgid " (MISSING KEYS:" msgstr " (NEDOSTAJUÆI KLJUÈEVI)" -#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827 +#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821 msgid ") " msgstr "" -#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828 +#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822 msgid " (UNTRUSTED KEYS:" msgstr "" -#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830 +#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824 msgid ")" msgstr "" -#: lib/rpmchecksig.c:824 +#: lib/rpmchecksig.c:818 msgid "OK" msgstr "" @@ -2716,185 +2716,177 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Ne mogu da otvorim %s za èitanje: %s" -#: lib/signature.c:119 +#: lib/signature.c:118 msgid "file is not regular -- skipping size check\n" msgstr "" -#: lib/signature.c:128 +#: lib/signature.c:127 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" -#: lib/signature.c:133 +#: lib/signature.c:132 #, c-format msgid " Actual size: %12d\n" msgstr "" -#: lib/signature.c:153 +#: lib/signature.c:152 #, fuzzy msgid "No signature\n" msgstr "%s: Potpis nije na raspolaganju\n" -#: lib/signature.c:157 +#: lib/signature.c:156 #, fuzzy msgid "Old PGP signature\n" msgstr "napravi PGP potpis" -#: lib/signature.c:170 +#: lib/signature.c:167 #, fuzzy msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "Stari (interni) potpis! Odakle vam!?" -#: lib/signature.c:226 +#: lib/signature.c:221 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "" -#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678 -#: lib/signature.c:711 +#: lib/signature.c:300 lib/signature.c:397 lib/signature.c:664 +#: lib/signature.c:697 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Ne mogu da izvr¹im PGP" -#: lib/signature.c:323 +#: lib/signature.c:316 #, fuzzy msgid "pgp failed\n" msgstr "PGP omanuo" #. PGP failed to write signature #. Just in case -#: lib/signature.c:330 +#: lib/signature.c:323 #, fuzzy msgid "pgp failed to write signature\n" msgstr "PGP nije uspeo da zapi¹e potpis" -#: lib/signature.c:335 +#: lib/signature.c:328 #, c-format msgid "PGP sig size: %d\n" msgstr "" -#: lib/signature.c:351 lib/signature.c:451 +#: lib/signature.c:342 lib/signature.c:440 #, fuzzy msgid "unable to read the signature\n" msgstr "ne mogu da proèitam potpis" -#: lib/signature.c:356 +#: lib/signature.c:347 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "" -#: lib/signature.c:423 +#: lib/signature.c:414 #, fuzzy msgid "gpg failed\n" msgstr "PGP omanuo" #. GPG failed to write signature #. Just in case -#: lib/signature.c:430 +#: lib/signature.c:421 #, fuzzy msgid "gpg failed to write signature\n" msgstr "PGP nije uspeo da zapi¹e potpis" -#: lib/signature.c:435 +#: lib/signature.c:426 #, c-format msgid "GPG sig size: %d\n" msgstr "" -#: lib/signature.c:456 +#: lib/signature.c:445 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:716 lib/signature.c:771 +#: lib/signature.c:702 lib/signature.c:753 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "" -#: lib/signature.c:750 +#: lib/signature.c:732 #, fuzzy, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Morate podesiti \"pgp_name:\" u va¹oj rpmrc datoteci" -#: lib/signature.c:763 +#: lib/signature.c:745 #, fuzzy, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Morate podesiti \"pgp_name:\" u va¹oj rpmrc datoteci" -#: lib/signature.c:807 +#: lib/signature.c:789 msgid "Header+Payload size: " msgstr "" -#: lib/signature.c:847 +#: lib/signature.c:825 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:906 +#: lib/signature.c:873 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1102 +#: lib/signature.c:1059 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "preskoèi sve MD5 potpise" -#: lib/signature.c:1221 +#: lib/signature.c:1168 msgid "Header " msgstr "" -#: lib/signature.c:1222 +#: lib/signature.c:1169 #, fuzzy msgid "V3 DSA signature: " msgstr "%s: Potpis nije na raspolaganju\n" -#: lib/signature.c:1311 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1338 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1342 +#: lib/signature.c:1275 #, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:180 +#: lib/transaction.c:173 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:985 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/transaction.c:1085 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:243 -msgid "package lacks both user name and id lists (this should never happen)\n" -msgstr "" - -#: lib/verify.c:264 -msgid "package lacks both group name and id lists (this should never happen)\n" -msgstr "" - -#: lib/verify.c:408 +#: lib/verify.c:324 #, fuzzy, c-format msgid "missing %s" msgstr "nedostaje { posle %" -#: lib/verify.c:505 +#: lib/verify.c:419 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Nezadovoljene meðuzavisnosti za %s-%s-%s: " -#: lib/verify.c:543 +#: lib/verify.c:459 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/sv.po b/po/sv.po index 03f9021..a4c800a 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-03-09 14:38-0500\n" +"POT-Creation-Date: 2002-03-12 11:41-0500\n" "PO-Revision-Date: 2001-09-12 14:18+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -826,7 +826,7 @@ msgstr "Kan inte l msgid "Could not open %s: %s\n" msgstr "Kunde inte öppna %s: %s\n" -#: build/pack.c:618 lib/psm.c:1444 +#: build/pack.c:618 lib/psm.c:1445 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunde inte skriva paket: %s\n" @@ -856,7 +856,7 @@ msgstr "Kan inte l msgid "Unable to write payload to %s: %s\n" msgstr "Kan inte skriva last till %s: %s\n" -#: build/pack.c:699 lib/psm.c:1725 +#: build/pack.c:699 lib/psm.c:1726 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1615,46 +1615,46 @@ msgstr "%s skapades som %s\n" msgid "error creating temporary file %s\n" msgstr "fel när tämporärfil %s skapades\n" -#: lib/package.c:184 lib/package.c:260 +#: lib/package.c:181 lib/package.c:257 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "paket med versionsnummer 1 stöds inte av denna version av RPM\n" -#: lib/package.c:205 lib/package.c:268 +#: lib/package.c:202 lib/package.c:265 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "endast paket med huvudnummer <= 4 stöds av denna version av RPM\n" -#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557 +#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553 #, c-format msgid "%s: readLead failed\n" msgstr "%s: readLead misslyckades\n" -#: lib/package.c:252 +#: lib/package.c:249 #, fuzzy, c-format msgid "%s: bad magic\n" msgstr "Felaktigt magiskt tal" -#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573 +#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature misslyckades\n" -#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578 +#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574 #, c-format msgid "%s: No signature available\n" msgstr "%s: Ingen signatur tillgänglig\n" -#: lib/package.c:331 lib/rpmchecksig.c:476 +#: lib/package.c:328 lib/rpmchecksig.c:474 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead misslyckades\n" -#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651 +#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505 +#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread misslyckades: %s\n" @@ -2209,36 +2209,36 @@ msgstr "k msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s-%s-%s har %d filer, test = %d\n" -#: lib/psm.c:1351 +#: lib/psm.c:1352 #, fuzzy, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: %s-skript misslyckades (%d), hoppar över %s-%s-%s\n" -#: lib/psm.c:1493 +#: lib/psm.c:1494 #, c-format msgid "user %s does not exist - using root\n" msgstr "användare %s finns inte - använder root\n" -#: lib/psm.c:1502 +#: lib/psm.c:1503 #, c-format msgid "group %s does not exist - using root\n" msgstr "grupp %s finns inte - använder root\n" -#: lib/psm.c:1544 +#: lib/psm.c:1545 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "uppackning av arkiv misslyckades%s%s: %s\n" -#: lib/psm.c:1545 +#: lib/psm.c:1546 msgid " on file " msgstr " vid fil " -#: lib/psm.c:1733 +#: lib/psm.c:1734 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s misslyckades på fil %s: %s\n" -#: lib/psm.c:1736 +#: lib/psm.c:1737 #, c-format msgid "%s failed: %s\n" msgstr "%s misslyckades: %s\n" @@ -2375,12 +2375,12 @@ msgstr "post %u kunde inte l msgid "package %s is not installed\n" msgstr "paket %s är inte installerat\n" -#: lib/rpmal.c:674 +#: lib/rpmal.c:673 #, fuzzy msgid "(added files)" msgstr "felaktig db-fil %s\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:770 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s JA (db-tillhandahållande)\n" @@ -2399,57 +2399,57 @@ msgstr "makeTempFile misslyckades\n" msgid "%s: Fwrite failed: %s\n" msgstr "%s: Fwrite misslyckades: %s\n" -#: lib/rpmchecksig.c:169 +#: lib/rpmchecksig.c:170 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: Kan inte signera v1.0 RPM\n" -#: lib/rpmchecksig.c:173 +#: lib/rpmchecksig.c:174 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: Kan inte signera om v2.0 RPM\n" -#: lib/rpmchecksig.c:253 +#: lib/rpmchecksig.c:254 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: writeLead misslyckades: %s\n" -#: lib/rpmchecksig.c:259 +#: lib/rpmchecksig.c:260 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignature misslyckades: %s\n" -#: lib/rpmchecksig.c:490 +#: lib/rpmchecksig.c:488 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead misslyckades\n" -#: lib/rpmchecksig.c:563 +#: lib/rpmchecksig.c:559 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Ingen signatur tillgänglig (v1.0 RPM)\n" -#: lib/rpmchecksig.c:810 +#: lib/rpmchecksig.c:804 msgid "NOT OK" msgstr "EJ OK" -#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825 +#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819 msgid " (MISSING KEYS:" msgstr " (SAKNADE NYCKLAR:" -#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827 +#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828 +#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822 msgid " (UNTRUSTED KEYS:" msgstr " (EJ BETRODDA NYCKLAR:" -#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830 +#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:824 +#: lib/rpmchecksig.c:818 msgid "OK" msgstr "OK" @@ -2661,183 +2661,172 @@ msgstr "Kan inte l msgid "Unable to open %s for reading: %s.\n" msgstr "Kan inte öppna %s för läsning: %s.\n" -#: lib/signature.c:119 +#: lib/signature.c:118 msgid "file is not regular -- skipping size check\n" msgstr "filen är inte en vanlig fil -- hoppar över storlekskontroll\n" -#: lib/signature.c:128 +#: lib/signature.c:127 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "" "Förväntad storlek: %12d = inledning(%d)+signaturer(%d)+utfyllnad(%d)+data(%" "d)\n" -#: lib/signature.c:133 +#: lib/signature.c:132 #, c-format msgid " Actual size: %12d\n" msgstr " Faktisk storlek: %12d\n" -#: lib/signature.c:153 +#: lib/signature.c:152 msgid "No signature\n" msgstr "Ingen signatur\n" -#: lib/signature.c:157 +#: lib/signature.c:156 msgid "Old PGP signature\n" msgstr "Gammal PGP-signatur\n" -#: lib/signature.c:170 +#: lib/signature.c:167 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "Gammal (endast intern) signatur! Hur fick du tag i den!?\n" -#: lib/signature.c:226 +#: lib/signature.c:221 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n" -#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678 -#: lib/signature.c:711 +#: lib/signature.c:300 lib/signature.c:397 lib/signature.c:664 +#: lib/signature.c:697 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "Kunde inte köra %s: %s\n" -#: lib/signature.c:323 +#: lib/signature.c:316 msgid "pgp failed\n" msgstr "pgp misslyckades\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:330 +#: lib/signature.c:323 msgid "pgp failed to write signature\n" msgstr "pgp misslyckades att skriva en signatur\n" -#: lib/signature.c:335 +#: lib/signature.c:328 #, c-format msgid "PGP sig size: %d\n" msgstr "PGP signaturstorlek: %d\n" -#: lib/signature.c:351 lib/signature.c:451 +#: lib/signature.c:342 lib/signature.c:440 msgid "unable to read the signature\n" msgstr "kan inte läsa signaturen\n" -#: lib/signature.c:356 +#: lib/signature.c:347 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "Fick %d byte PGP-signatur\n" -#: lib/signature.c:423 +#: lib/signature.c:414 msgid "gpg failed\n" msgstr "gpg misslyckades\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:430 +#: lib/signature.c:421 msgid "gpg failed to write signature\n" msgstr "gpg kunde inte skriva signatur\n" -#: lib/signature.c:435 +#: lib/signature.c:426 #, c-format msgid "GPG sig size: %d\n" msgstr "GPG-signaturstorlek: %d\n" -#: lib/signature.c:456 +#: lib/signature.c:445 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "Fick %d byte GPG-signatur\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:716 lib/signature.c:771 +#: lib/signature.c:702 lib/signature.c:753 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "Felaktig %%_signature-spec i makrofil\n" -#: lib/signature.c:750 +#: lib/signature.c:732 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Du måste sätta \"%%_gpg_name\" i din makrofil\n" -#: lib/signature.c:763 +#: lib/signature.c:745 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Du måste sätta \"%%_pgp_name\" i din makrofil\n" -#: lib/signature.c:807 +#: lib/signature.c:789 #, fuzzy msgid "Header+Payload size: " msgstr "Huvudstorleken för stor" -#: lib/signature.c:847 +#: lib/signature.c:825 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:906 +#: lib/signature.c:873 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1102 +#: lib/signature.c:1059 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "hoppa över eventuella MD5-signaturer" -#: lib/signature.c:1221 +#: lib/signature.c:1168 msgid "Header " msgstr "" -#: lib/signature.c:1222 +#: lib/signature.c:1169 #, fuzzy msgid "V3 DSA signature: " msgstr "Ingen signatur\n" -#: lib/signature.c:1311 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1338 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1342 +#: lib/signature.c:1275 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n" -#: lib/transaction.c:180 +#: lib/transaction.c:173 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s överhoppad på grund av missingok-flagga\n" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:985 #, c-format msgid "excluding directory %s\n" msgstr "hoppar över katalogen %s\n" -#: lib/transaction.c:1085 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "hämtar lista över monterade filsystem\n" -#: lib/verify.c:243 -msgid "package lacks both user name and id lists (this should never happen)\n" -msgstr "" -"paketet saknar både användarnamn och id-listor (detta borde aldrig " -"inträffa)\n" - -#: lib/verify.c:264 -msgid "package lacks both group name and id lists (this should never happen)\n" -msgstr "" -"paketet saknar både gruppnamn och id-listor (detta borde aldrig inträffa)\n" - -#: lib/verify.c:408 +#: lib/verify.c:324 #, c-format msgid "missing %s" msgstr "saknas %s" -#: lib/verify.c:505 +#: lib/verify.c:419 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Ouppfyllda beroenden för %s-%s-%s: " -#: lib/verify.c:543 +#: lib/verify.c:459 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "%s-%s-%s: kontrollsumma för oföränderlig huvudregion misslyckades\n" @@ -3433,6 +3422,18 @@ msgstr "url-port m msgid "failed to create %s: %s\n" msgstr "kunde inte skapa %s: %s\n" +#~ msgid "" +#~ "package lacks both user name and id lists (this should never happen)\n" +#~ msgstr "" +#~ "paketet saknar både användarnamn och id-listor (detta borde aldrig " +#~ "inträffa)\n" + +#~ msgid "" +#~ "package lacks both group name and id lists (this should never happen)\n" +#~ msgstr "" +#~ "paketet saknar både gruppnamn och id-listor (detta borde aldrig " +#~ "inträffa)\n" + #, fuzzy #~ msgid "sign a package, discarding all current signatures" #~ msgstr "signera ett paket (släng nuvarande signatur)" diff --git a/po/tr.po b/po/tr.po index edebec3..978befc 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-03-09 14:38-0500\n" +"POT-Creation-Date: 2002-03-12 11:41-0500\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -837,7 +837,7 @@ msgstr "%s'den ba msgid "Could not open %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: build/pack.c:618 lib/psm.c:1444 +#: build/pack.c:618 lib/psm.c:1445 #, c-format msgid "Unable to write package: %s\n" msgstr "paket yazýlamadý: %s\n" @@ -867,7 +867,7 @@ msgstr "%s'den payload okunamad msgid "Unable to write payload to %s: %s\n" msgstr "%s'e payload yazýlamadý: %s\n" -#: build/pack.c:699 lib/psm.c:1725 +#: build/pack.c:699 lib/psm.c:1726 #, c-format msgid "Wrote: %s\n" msgstr "Yazýldý: %s\n" @@ -1635,48 +1635,48 @@ msgstr "%s %s olarak olu msgid "error creating temporary file %s\n" msgstr "%s geçici dosyasý oluþturulurken hata\n" -#: lib/package.c:184 lib/package.c:260 +#: lib/package.c:181 lib/package.c:257 msgid "packaging version 1 is not supported by this version of RPM\n" msgstr "RPM'nin bu sürümünde paket sürümü 1 desteklenmiyor\n" -#: lib/package.c:205 lib/package.c:268 +#: lib/package.c:202 lib/package.c:265 msgid "" "only packaging with major numbers <= 4 is supported by this version of RPM\n" msgstr "" "RPM'nin bu sürümünde sadece ilk sürüm rakamý <= 4 olan paketler " "destekleniyor\n" -#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557 +#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553 #, c-format msgid "%s: readLead failed\n" msgstr "%s: readLead baþarýsýz\n" -#: lib/package.c:252 +#: lib/package.c:249 #, fuzzy, c-format msgid "%s: bad magic\n" msgstr "Magic hatalý" -#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573 +#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569 #, c-format msgid "%s: rpmReadSignature failed\n" msgstr "%s: rpmReadSignature baþarýsýz\n" -#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578 +#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574 #, c-format msgid "%s: No signature available\n" msgstr "%s: Ýmza bulundurmuyor\n" -#: lib/package.c:331 lib/rpmchecksig.c:476 +#: lib/package.c:328 lib/rpmchecksig.c:474 #, fuzzy, c-format msgid "%s: headerRead failed\n" msgstr "%s: readLead baþarýsýz\n" -#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651 +#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645 #, c-format msgid "only V3 signatures can be verified, skipping V%u signature" msgstr "" -#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505 +#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503 #, c-format msgid "%s: Fread failed: %s\n" msgstr "%s: Fread baþarýsýz: %s\n" @@ -2232,36 +2232,36 @@ msgstr "%s beti msgid "%s: %s has %d files, test = %d\n" msgstr "%s: %s-%s-%s %d dosya içeriyor, test = %d\n" -#: lib/psm.c:1351 +#: lib/psm.c:1352 #, fuzzy, c-format msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: %s betiði baþarýsýz (%d), %s-%s-%s atlanýyor\n" -#: lib/psm.c:1493 +#: lib/psm.c:1494 #, c-format msgid "user %s does not exist - using root\n" msgstr "kullanýcý %s yok - root kullanýlacak\n" -#: lib/psm.c:1502 +#: lib/psm.c:1503 #, c-format msgid "group %s does not exist - using root\n" msgstr "grup %s yok - root kullanýlacak\n" -#: lib/psm.c:1544 +#: lib/psm.c:1545 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "arþiv paketi açýlýrken baþarýsýz%s%s: %s\n" -#: lib/psm.c:1545 +#: lib/psm.c:1546 msgid " on file " msgstr " dosyada " -#: lib/psm.c:1733 +#: lib/psm.c:1734 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/psm.c:1736 +#: lib/psm.c:1737 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s baþarýsýz\n" @@ -2398,12 +2398,12 @@ msgstr "%u. kay msgid "package %s is not installed\n" msgstr "%s paketi kurulu deðil\n" -#: lib/rpmal.c:674 +#: lib/rpmal.c:673 #, fuzzy msgid "(added files)" msgstr "db dosyasý %s hatalý\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:770 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s EVET (db saðlar)\n" @@ -2422,57 +2422,57 @@ msgstr "makeTempFile ba msgid "%s: Fwrite failed: %s\n" msgstr "%s: Fwrite baþarýsýz: %s\n" -#: lib/rpmchecksig.c:169 +#: lib/rpmchecksig.c:170 #, fuzzy, c-format msgid "%s: Can't sign v1 packaging\n" msgstr "%s: v1.0 RPM (eski sürüm) imzalanamaz\n" -#: lib/rpmchecksig.c:173 +#: lib/rpmchecksig.c:174 #, fuzzy, c-format msgid "%s: Can't re-sign v2 packaging\n" msgstr "%s: v2.0 RPM (eski sürüm) yeniden imzalanamaz\n" -#: lib/rpmchecksig.c:253 +#: lib/rpmchecksig.c:254 #, c-format msgid "%s: writeLead failed: %s\n" msgstr "%s: writeLead baþarýsýz: %s\n" -#: lib/rpmchecksig.c:259 +#: lib/rpmchecksig.c:260 #, c-format msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignature baþarýsýz: %s\n" -#: lib/rpmchecksig.c:490 +#: lib/rpmchecksig.c:488 #, fuzzy, c-format msgid "%s: headerGetEntry failed\n" msgstr "%s: readLead baþarýsýz\n" -#: lib/rpmchecksig.c:563 +#: lib/rpmchecksig.c:559 #, c-format msgid "%s: No signature available (v1.0 RPM)\n" msgstr "%s: Ýmza bulundurmuyor (v1.0 RPM)\n" -#: lib/rpmchecksig.c:810 +#: lib/rpmchecksig.c:804 msgid "NOT OK" msgstr "TAMAM DEÐÝL" -#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825 +#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819 msgid " (MISSING KEYS:" msgstr " (EKSÝK ANAHTARLAR:" -#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827 +#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821 msgid ") " msgstr ") " -#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828 +#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822 msgid " (UNTRUSTED KEYS:" msgstr " (GÜVENCESÝZ ANAHTARLAR:" -#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830 +#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824 msgid ")" msgstr ")" -#: lib/rpmchecksig.c:824 +#: lib/rpmchecksig.c:818 msgid "OK" msgstr "Tamam" @@ -2684,181 +2684,170 @@ msgstr "%s okunam msgid "Unable to open %s for reading: %s.\n" msgstr "%s okuma eriþimi için açýlamadý: %s.\n" -#: lib/signature.c:119 +#: lib/signature.c:118 msgid "file is not regular -- skipping size check\n" msgstr "dosya normal deðil -- uzunluk denetimi atlanýyor\n" -#: lib/signature.c:128 +#: lib/signature.c:127 #, c-format msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n" msgstr "gereken boyut: %12d = (%d)uç+(%d)imza+(%d)iz+(%d)veri\n" -#: lib/signature.c:133 +#: lib/signature.c:132 #, c-format msgid " Actual size: %12d\n" msgstr " Gerçek boyut: %12d\n" -#: lib/signature.c:153 +#: lib/signature.c:152 msgid "No signature\n" msgstr "Ýmza yok\n" -#: lib/signature.c:157 +#: lib/signature.c:156 msgid "Old PGP signature\n" msgstr "Eski PGP imzasý\n" -#: lib/signature.c:170 +#: lib/signature.c:167 msgid "Old (internal-only) signature! How did you get that!?\n" msgstr "Eski imza !!! Bunu nasýl aldýn!?\n" -#: lib/signature.c:226 +#: lib/signature.c:221 #, c-format msgid "Signature: size(%d)+pad(%d)\n" msgstr "Ýmza: boyut(%d)+iz(%d)\n" -#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678 -#: lib/signature.c:711 +#: lib/signature.c:300 lib/signature.c:397 lib/signature.c:664 +#: lib/signature.c:697 #, fuzzy, c-format msgid "Could not exec %s: %s\n" msgstr "%s icra edilemedi: %s\n" -#: lib/signature.c:323 +#: lib/signature.c:316 msgid "pgp failed\n" msgstr "pgp hata verdi\n" #. PGP failed to write signature #. Just in case -#: lib/signature.c:330 +#: lib/signature.c:323 msgid "pgp failed to write signature\n" msgstr "pgp imzasýnýn yazýlmasý baþarýsýz\n" -#: lib/signature.c:335 +#: lib/signature.c:328 #, c-format msgid "PGP sig size: %d\n" msgstr "PGP imza uzunluðu: %d\n" -#: lib/signature.c:351 lib/signature.c:451 +#: lib/signature.c:342 lib/signature.c:440 msgid "unable to read the signature\n" msgstr "imza okunamadý\n" -#: lib/signature.c:356 +#: lib/signature.c:347 #, c-format msgid "Got %d bytes of PGP sig\n" msgstr "GPG imzasýnýn %d baytý alýndý\n" -#: lib/signature.c:423 +#: lib/signature.c:414 msgid "gpg failed\n" msgstr "gpg hata verdi\n" #. GPG failed to write signature #. Just in case -#: lib/signature.c:430 +#: lib/signature.c:421 msgid "gpg failed to write signature\n" msgstr "imzanýn yazýlmasý sýrasýnda gpg hata verdi\n" -#: lib/signature.c:435 +#: lib/signature.c:426 #, c-format msgid "GPG sig size: %d\n" msgstr "GPG imza uzunluðu: %d\n" -#: lib/signature.c:456 +#: lib/signature.c:445 #, c-format msgid "Got %d bytes of GPG sig\n" msgstr "GPG imzasýnýn %d baytý alýndý\n" #. @notreached@ #. This case should have been screened out long ago. -#: lib/signature.c:716 lib/signature.c:771 +#: lib/signature.c:702 lib/signature.c:753 #, c-format msgid "Invalid %%_signature spec in macro file\n" msgstr "Makro dosyasýnda %%_signature spec geçersiz\n" -#: lib/signature.c:750 +#: lib/signature.c:732 #, c-format msgid "You must set \"%%_gpg_name\" in your macro file\n" msgstr "Makro dosyanýzda \"%%_pgp_name\" tanýmlanmýþ olmalý\n" -#: lib/signature.c:763 +#: lib/signature.c:745 #, c-format msgid "You must set \"%%_pgp_name\" in your macro file\n" msgstr "Makro dosyanýzda \"%%_pgp_name\" belirtmelisiniz\n" -#: lib/signature.c:807 +#: lib/signature.c:789 #, fuzzy msgid "Header+Payload size: " msgstr "Baþlýk çok uzun" -#: lib/signature.c:847 +#: lib/signature.c:825 msgid "MD5 digest: " msgstr "" -#: lib/signature.c:906 +#: lib/signature.c:873 msgid "Header SHA1 digest: " msgstr "" -#: lib/signature.c:1102 +#: lib/signature.c:1059 #, fuzzy msgid "V3 RSA/MD5 signature: " msgstr "tüm MD5 imzalarýný atlar" -#: lib/signature.c:1221 +#: lib/signature.c:1168 msgid "Header " msgstr "" -#: lib/signature.c:1222 +#: lib/signature.c:1169 #, fuzzy msgid "V3 DSA signature: " msgstr "Ýmza yok\n" -#: lib/signature.c:1311 +#: lib/signature.c:1244 msgid "Verify signature: BAD PARAMETERS\n" msgstr "" -#: lib/signature.c:1338 +#: lib/signature.c:1271 msgid "Broken MD5 digest: UNSUPPORTED\n" msgstr "" -#: lib/signature.c:1342 +#: lib/signature.c:1275 #, fuzzy, c-format msgid "Signature: UNKNOWN (%d)\n" msgstr "Ýmza: boyut(%d)+iz(%d)\n" -#: lib/transaction.c:180 +#: lib/transaction.c:173 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "missingok flamasýndan dolayý %s atlandý\n" #. @innercontinue@ -#: lib/transaction.c:990 +#: lib/transaction.c:985 #, c-format msgid "excluding directory %s\n" msgstr "%s dizini dýþlanýyor\n" -#: lib/transaction.c:1085 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "baðlý dosya sistemlerinin listesi alýnýyor\n" -#: lib/verify.c:243 -msgid "package lacks both user name and id lists (this should never happen)\n" -msgstr "" -"paket hem kullanýcý ismi hem de kimlik listelerinden yoksun (bu hiç iyi " -"deðil)\n" - -#: lib/verify.c:264 -msgid "package lacks both group name and id lists (this should never happen)\n" -msgstr "" -"paket hem grup ismi hem de kimlik listelerinden yoksun (bu hiç iyi deðil)\n" - -#: lib/verify.c:408 +#: lib/verify.c:324 #, c-format msgid "missing %s" msgstr "eksik %s" -#: lib/verify.c:505 +#: lib/verify.c:419 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "%s-%s-%s için tatmin edici olmayan baðýmlýlýklar: " -#: lib/verify.c:543 +#: lib/verify.c:459 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "%s-%s-%s: deðiþmez baþlýk alaný özet denetimi baþarýsýz\n" @@ -3457,6 +3446,18 @@ msgstr "url portu bir say msgid "failed to create %s: %s\n" msgstr "%s oluþturulamadý: %s\n" +#~ msgid "" +#~ "package lacks both user name and id lists (this should never happen)\n" +#~ msgstr "" +#~ "paket hem kullanýcý ismi hem de kimlik listelerinden yoksun (bu hiç iyi " +#~ "deðil)\n" + +#~ msgid "" +#~ "package lacks both group name and id lists (this should never happen)\n" +#~ msgstr "" +#~ "paket hem grup ismi hem de kimlik listelerinden yoksun (bu hiç iyi " +#~ "deðil)\n" + #, fuzzy #~ msgid "sign a package, discarding all current signatures" #~ msgstr "paketi imzalar (mevcut imza kaldýrýlýr)" diff --git a/python/rpmmodule.c b/python/rpmmodule.c index 079e0b0..379b4ac 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -223,10 +223,27 @@ static PyObject * hdrVerifyFile(hdrObject * s, PyObject * args) { fileNumber = (int) PyInt_AsLong(args); - /* XXX this routine might use callbacks intelligently. */ - if (rpmVerifyFile("", s->h, fileNumber, &verifyResult, RPMVERIFY_NONE)) { - Py_INCREF(Py_None); - return Py_None; + { rpmTransactionSet ts; + int scareMem = 1; + TFI_t fi; + int rc; + + ts = rpmtransCreateSet(NULL, NULL); + fi = fiNew(ts, NULL, s->h, RPMTAG_BASENAMES, scareMem); + fi = tfiInit(fi, fileNumber); + if (fi != NULL && tfiNext(fi) >= 0) { + /* XXX this routine might use callbacks intelligently. */ + rc = rpmVerifyFile(ts, fi, &verifyResult, RPMVERIFY_NONE); + } else + rc = 1; + + fi = fiFree(fi, 1); + rpmtransFree(ts); + + if (rc) { + Py_INCREF(Py_None); + return Py_None; + } } list = PyList_New(0); diff --git a/rpm.spec b/rpm.spec index 3dc4762..1b44b4b 100644 --- a/rpm.spec +++ b/rpm.spec @@ -527,6 +527,8 @@ fi * Sun Mar 10 2002 Jeff Johnson - make --addsign and --resign behave exactly the same. - splint annotationsm, signature cleanup. +- drill ts/fi through verify mode, add methods to keep fi abstract. +- use mmap when calculating file digests on verify, ~20% faster. * Mon Sep 24 2001 Jeff Johnson - Start rpm-4.1. diff --git a/rpm.spec.in b/rpm.spec.in index 3dafa25..6d79e19 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -527,6 +527,8 @@ fi * Sun Mar 10 2002 Jeff Johnson - make --addsign and --resign behave exactly the same. - splint annotationsm, signature cleanup. +- drill ts/fi through verify mode, add methods to keep fi abstract. +- use mmap when calculating file digests on verify, ~20% faster. * Mon Sep 24 2001 Jeff Johnson - Start rpm-4.1. diff --git a/rpmdb/legacy.c b/rpmdb/legacy.c index 9d9966c..48b128b 100644 --- a/rpmdb/legacy.c +++ b/rpmdb/legacy.c @@ -13,28 +13,64 @@ int domd5(const char * fn, unsigned char * digest, int asAscii) { - int rc; - - FD_t fd = Fopen(fn, "r.ufdio"); - unsigned char buf[BUFSIZ]; + const char * path; unsigned char * md5sum = NULL; size_t md5len; + int rc = 0; + + switch(urlPath(fn, &path)) { + case URL_IS_PATH: + case URL_IS_UNKNOWN: +#if HAVE_MMAP + { struct stat sb, * st = &sb; + DIGEST_CTX ctx; + void * mapped; + int fdno; + int xx; + + if (stat(path, st) < 0 + || (fdno = open(path, O_RDONLY)) < 0) + return 1; + mapped = mmap(NULL, st->st_size, PROT_READ, MAP_SHARED, fdno, 0); + if (mapped == (void *)-1) { + xx = close(fdno); + return 1; + } + (void) madvise(mapped, st->st_size, MADV_SEQUENTIAL); + + ctx = rpmDigestInit(PGPHASHALGO_MD5, RPMDIGEST_NONE); + xx = rpmDigestUpdate(ctx, mapped, st->st_size); + xx = rpmDigestFinal(ctx, (void **)&md5sum, &md5len, asAscii); + xx = munmap(mapped, st->st_size); + xx = close(fdno); + + } break; +#endif + case URL_IS_FTP: + case URL_IS_HTTP: + case URL_IS_DASH: + default: + { FD_t fd; + unsigned char buf[32*BUFSIZ]; + + fd = Fopen(fn, "r.ufdio"); + if (fd == NULL || Ferror(fd)) { + if (fd != NULL) + (void) Fclose(fd); + return 1; + } - if (fd == NULL || Ferror(fd)) { - if (fd != NULL) - (void) Fclose(fd); - return 1; - } - - fdInitDigest(fd, PGPHASHALGO_MD5, 0); + fdInitDigest(fd, PGPHASHALGO_MD5, 0); - while ((rc = Fread(buf, sizeof(buf[0]), sizeof(buf), fd)) > 0) - {}; - fdFiniDigest(fd, PGPHASHALGO_MD5, (void **)&md5sum, &md5len, asAscii); + while ((rc = Fread(buf, sizeof(buf[0]), sizeof(buf), fd)) > 0) + {}; + fdFiniDigest(fd, PGPHASHALGO_MD5, (void **)&md5sum, &md5len, asAscii); - if (Ferror(fd)) - rc = 1; - (void) Fclose(fd); + if (Ferror(fd)) + rc = 1; + (void) Fclose(fd); + } break; + } if (!rc) memcpy(digest, md5sum, md5len); diff --git a/rpmio/fts.c b/rpmio/fts.c index eefc414..8387e81 100644 --- a/rpmio/fts.c +++ b/rpmio/fts.c @@ -117,7 +117,7 @@ Fts_open(char * const * argv, int options, register FTS *sp; register FTSENT *p, *root; register int nitems; - FTSENT *parent, *tmp; + FTSENT *parent, *tmp = NULL; int len; /* Options check. */ -- 2.7.4