From a5a5eed7c46d5f54e443b9ea0556710055cfb07b Mon Sep 17 00:00:00 2001 From: jbj Date: Mon, 5 Nov 2001 03:44:05 +0000 Subject: [PATCH] Start deconstructing availablePackage list. CVS patchset: 5156 CVS date: 2001/11/05 03:44:05 --- lib/depends.c | 133 +++++++++++++++++++++++++++++++++----------------- lib/depends.h | 29 ++++++++++- lib/psm.c | 11 ++++- lib/psm.h | 5 +- lib/rpmal.c | 139 +++-------------------------------------------------- lib/rpmal.h | 99 +------------------------------------- lib/rpmds.c | 7 ++- lib/rpmlib.h | 1 + lib/transaction.c | 29 +++++++++-- po/cs.po | 93 ++++++++++++++++++----------------- po/da.po | 93 ++++++++++++++++++----------------- po/de.po | 93 ++++++++++++++++++----------------- po/en_RN.po | 89 ++++++++++++++++------------------ po/es.po | 89 ++++++++++++++++------------------ po/eu_ES.po | 89 ++++++++++++++++------------------ po/fi.po | 93 ++++++++++++++++++----------------- po/fr.po | 89 ++++++++++++++++------------------ po/gl.po | 89 ++++++++++++++++------------------ po/hu.po | 89 ++++++++++++++++------------------ po/id.po | 89 ++++++++++++++++------------------ po/is.po | 89 ++++++++++++++++------------------ po/it.po | 89 ++++++++++++++++------------------ po/ja.po | 93 ++++++++++++++++++----------------- po/ko.po | 93 ++++++++++++++++++----------------- po/no.po | 89 ++++++++++++++++------------------ po/pl.po | 93 ++++++++++++++++++----------------- po/pt.po | 93 ++++++++++++++++++----------------- po/pt_BR.po | 89 ++++++++++++++++------------------ po/ro.po | 89 ++++++++++++++++------------------ po/rpm.pot | 89 ++++++++++++++++------------------ po/ru.po | 93 ++++++++++++++++++----------------- po/sk.po | 93 ++++++++++++++++++----------------- po/sl.po | 95 ++++++++++++++++++------------------ po/sr.po | 93 ++++++++++++++++++----------------- po/sv.po | 93 ++++++++++++++++++----------------- po/tr.po | 93 ++++++++++++++++++----------------- po/uk.po | 89 ++++++++++++++++------------------ po/wa.po | 89 ++++++++++++++++------------------ po/zh.po | 89 ++++++++++++++++------------------ po/zh_CN.GB2312.po | 89 ++++++++++++++++------------------ 40 files changed, 1525 insertions(+), 1745 deletions(-) diff --git a/lib/depends.c b/lib/depends.c index 8854473..a1f24cf 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -2,6 +2,8 @@ * \file lib/depends.c */ +#define _DS_SCAREMEM 0 + #include "system.h" #include @@ -269,28 +271,10 @@ char * hGetNVR(Header h, const char ** np ) return NVR; } -/** - * Return next transaction element of type. - * @param tei transaction element iterator - * @return next transaction element of type, NULL on termination - */ -static /*@dependent@*/ /*@null@*/ -transactionElement teNext(teIterator tei, enum rpmTransactionType type) - /*@modifies tei @*/ -{ - transactionElement p; - - while ((p = teNextIterator(tei)) != NULL) { - if (p->type == type) - break; - } - return p; -} - int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd, const void * key, int upgrade, rpmRelocation * relocs) { - int scareMem = 1; + int scareMem = _DS_SCAREMEM; HGE_t hge = (HGE_t)headerGetEntryMinMemory; const char * name = NULL; const char * addNVR = hGetNVR(h, &name); @@ -369,13 +353,14 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd, ts->order = xrealloc(ts->order, ts->orderAlloced * sizeof(*ts->order)); } /* XXX cast assumes that available keys are indices, not pointers */ - pkgKey = alAddPackage(ts->addedPackages, (alKey)apx, h, key, fd, relocs); + pkgKey = alAddPackage(ts->addedPackages, (alKey)apx, h); if (pkgKey == RPMAL_NOMATCH) { ec = 1; goto exit; } p = ts->order + i; memset(p, 0, sizeof(*p)); + p->u.addedKey = pkgKey; p->type = TR_ADDED; @@ -404,6 +389,30 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd, } #endif + /*@-assignexpose -ownedtrans @*/ + p->key = key; + /*@=assignexpose =ownedtrans @*/ + /*@-type@*/ /* FIX: cast? */ + p->fd = (fd != NULL ? fdLink(fd, "rpmtransAddPackage") : NULL); + /*@=type@*/ + + if (relocs) { + rpmRelocation * r; + + for (i = 0, r = relocs; r->oldPath || r->newPath; i++, r++) + {}; + p->relocs = xmalloc((i + 1) * sizeof(*p->relocs)); + + for (i = 0, r = relocs; r->oldPath || r->newPath; i++, r++) { + p->relocs[i].oldPath = r->oldPath ? xstrdup(r->oldPath) : NULL; + p->relocs[i].newPath = r->newPath ? xstrdup(r->newPath) : NULL; + } + p->relocs[i].oldPath = NULL; + p->relocs[i].newPath = NULL; + } else { + p->relocs = NULL; + } + if (!duplicate) { assert(apx == ts->numAddedPackages); ts->numAddedPackages++; @@ -495,10 +504,13 @@ exit: return ec; } -void rpmtransAvailablePackage(rpmTransactionSet ts, Header h, const void * key) +void rpmtransAvailablePackage(rpmTransactionSet ts, Header h, + /*@unused@*/ const void * key) { + alKey pkgKey; + /* XXX FIXME: return code RPMAL_NOMATCH is error */ - (void) alAddPackage(ts->availablePackages, RPMAL_NOMATCH, h, key, NULL, NULL); + pkgKey = alAddPackage(ts->availablePackages, RPMAL_NOMATCH, h); } int rpmtransRemovePackage(rpmTransactionSet ts, int dboffset) @@ -521,6 +533,7 @@ void rpmtransClean(rpmTransactionSet ts) rpmTransactionSet rpmtransFree(rpmTransactionSet ts) { if (ts) { + teIterator pi; transactionElement p; (void) rpmtsUnlink(ts, "tsCreate"); @@ -528,6 +541,23 @@ rpmTransactionSet rpmtransFree(rpmTransactionSet ts) if (ts->nrefs > 0) return NULL; + pi = teInitIterator(ts); + while ((p = teNext(pi, TR_ADDED)) != NULL) { + rpmRelocation * r; + if (p->relocs) { + for (r = p->relocs; (r->oldPath || r->newPath); r++) { + r->oldPath = _free(r->oldPath); + r->newPath = _free(r->newPath); + } + p->relocs = _free(p->relocs); + } + /*@-type@*/ /* FIX: cast? */ + if (p->fd != NULL) + p->fd = fdFree(p->fd, "alAddPackage (alFree)"); + /*@=type@*/ + } + pi = teFreeIterator(pi); + ts->addedPackages = alFree(ts->addedPackages); ts->availablePackages = alFree(ts->availablePackages); ts->di = _free(ts->di); @@ -751,7 +781,7 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp, /*@modifies ts, h, psp, fileSystem */ { const char * name, * version, * release; - int scareMem = 1; + int scareMem = _DS_SCAREMEM; rpmDepSet requires; rpmDepSet conflicts; const char * Name; @@ -789,15 +819,23 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp, suggestedPkgs = NULL; +#ifdef DYING /*@-branchstate -mods -type@*/ /* FIX: hack to disable noise */ +#endif if (ts->availablePackages != NULL) { +#ifdef DYING const char * Type = requires->Type; requires->Type = NULL; +#endif suggestedPkgs = alAllSatisfiesDepend(ts->availablePackages, requires); +#ifdef DYING requires->Type = Type; +#endif } +#ifdef DYING /*@=branchstate =mods =type@*/ +#endif dsProblem(psp, h, requires, suggestedPkgs); @@ -1125,17 +1163,29 @@ static inline int addRelation(rpmTransactionSet ts, alKey pkgKey; int i = 0; + if ((Name = dsiGetN(requires)) == NULL) + return 0; /* XXX can't happen */ + + /* Avoid rpmlib feature dependencies. */ + if (!strncmp(Name, "rpmlib(", sizeof("rpmlib(")-1)) + return 0; + +#ifdef DYING /*@-mods -type@*/ /* FIX: hack to disable noise */ { const char * Type = requires->Type; requires->Type = NULL; +#endif + pkgKey = alSatisfiesDepend(ts->addedPackages, requires); + +#ifdef DYING requires->Type = Type; } /*@=mods =type@*/ -/*@-nullpass@*/ +#endif + if (_te_debug) fprintf(stderr, "addRelation: pkgKey %ld\n", (long)pkgKey); -/*@=nullpass@*/ /* Ordering depends only on added package relations. */ if (pkgKey == RPMAL_NOMATCH) @@ -1149,18 +1199,6 @@ fprintf(stderr, "addRelation: pkgKey %ld\n", (long)pkgKey); break; } qi = teFreeIterator(qi); -/*@-nullpass -nullderef@*/ -if (_te_debug) -fprintf(stderr, "addRelation: q %p(%s) from %p[%d:%d]\n", q, q->name, ts->order, i, ts->orderCount); -/*@=nullpass =nullderef@*/ - assert(i < ts->orderCount); - - if ((Name = dsiGetN(requires)) == NULL) - return 0; /* XXX can't happen */ - - /* Avoid rpmlib feature dependencies. */ - if (!strncmp(Name, "rpmlib(", sizeof("rpmlib(")-1)) - return 0; #if defined(DEPENDENCY_WHITEOUT) /* Avoid certain dependency relations. */ @@ -1168,10 +1206,15 @@ fprintf(stderr, "addRelation: q %p(%s) from %p[%d:%d]\n", q, q->name, ts->order, return 0; #endif + i = (q ? q - ts->order : -1); + +/*@-nullpass -nullderef@*/ +if (_te_debug) +fprintf(stderr, "addRelation: q %p(%s) from %p[%d:%d]\n", q, q->name, ts->order, i, ts->orderCount); +/*@=nullpass =nullderef@*/ + /* Avoid redundant relations. */ /* XXX TODO: add control bit. */ - i = q - ts->order; - if (selected[i] != 0) return 0; selected[i] = 1; @@ -1203,7 +1246,7 @@ prtTSI(NULL, &p->tsi); /*@-nullpass -compmempass@*/ prtTSI("addRelation: new", tsi); if (_te_debug) -fprintf(stderr, "addRelation: BEFORE q %p(%s)\n", q, q->name); +fprintf(stderr, "addRelation: BEFORE q %p(%s)", q, q->name); prtTSI(NULL, &q->tsi); /*@=nullpass =compmempass@*/ /*@-mods@*/ @@ -1212,7 +1255,7 @@ prtTSI(NULL, &q->tsi); /*@=mods@*/ /*@-nullpass -compmempass@*/ if (_te_debug) -fprintf(stderr, "addRelation: AFTER q %p(%s)\n", q, q->name); +fprintf(stderr, "addRelation: AFTER q %p(%s)", q, q->name); prtTSI(NULL, &q->tsi); /*@=nullpass =compmempass@*/ return 0; @@ -1622,14 +1665,14 @@ prtTSI(" p", &p->tsi); j = needle->orIndex; /*@-assignexpose@*/ q = ts->order + j; - newOrder[newOrderCount++] = *q; /* structure assignment */ +/*@i@*/ newOrder[newOrderCount++] = *q; /* structure assignment */ /*@=assignexpose@*/ for (j = needle->orIndex + 1; j < ts->orderCount; j++) { q = ts->order + j; if (q->type == TR_REMOVED && q->u.removed.dependsOnKey == needle->pkgKey) { /*@-assignexpose@*/ - newOrder[newOrderCount++] = *q; /* structure assignment */ +/*@i@*/ newOrder[newOrderCount++] = *q; /* structure assignment */ /*@=assignexpose@*/ } else /*@innerbreak@*/ break; @@ -1643,7 +1686,7 @@ prtTSI(" p", &p->tsi); while ((p = teNext(pi, TR_REMOVED)) != NULL) { if (p->u.removed.dependsOnKey == RPMAL_NOMATCH) { /*@-assignexpose@*/ - newOrder[newOrderCount] = *p; /* structure assignment */ +/*@i@*/ newOrder[newOrderCount] = *p; /* structure assignment */ /*@=assignexpose@*/ newOrderCount++; } @@ -1694,7 +1737,7 @@ static int rpmdbCloseDBI(/*@null@*/ rpmdb db, int rpmtag) int rpmdepCheck(rpmTransactionSet ts, rpmDependencyConflict * conflicts, int * numConflicts) { - int scareMem = 1; + int scareMem = _DS_SCAREMEM; HGE_t hge = (HGE_t)headerGetEntryMinMemory; HFD_t hfd = headerFreeData; rpmdbMatchIterator mi = NULL; diff --git a/lib/depends.h b/lib/depends.h index c4eebb0..94fb608 100644 --- a/lib/depends.h +++ b/lib/depends.h @@ -86,6 +86,15 @@ struct transactionElement_s { uint_32 multiLib; /* (TR_ADDED) MULTILIB */ int_32 filesCount; /* (TR_ADDED) No. files in package. */ +/*@kept@*//*@null@*/ + const void * key; + /*!< (TR_ADDED) Retrieval key (CLI uses file name, e.g.). */ +/*@owned@*/ /*@null@*/ + rpmRelocation * relocs; + /*!< (TR_ADDED) Payload file relocations. */ +/*@refcounted@*/ /*@null@*/ + FD_t fd; /*!< (TR_ADDED) Payload file descriptor (usually NULL). */ + /*@-fielduse@*/ /* LCL: confused by union? */ union { /*@unused@*/ alKey addedKey; @@ -225,7 +234,7 @@ teIterator teInitIterator(rpmTransactionSet ts) * @param tei transaction element iterator * @return transaction element, NULL on termination */ -/*@unused@*/ static inline /*@dependent@*/ +/*@unused@*/ static inline /*@dependent@*/ /*@null@*/ transactionElement teNextIterator(teIterator tei) /*@modifies tei @*/ { @@ -244,6 +253,24 @@ transactionElement teNextIterator(teIterator tei) return te; /*@=compdef =usereleased@*/ } + +/** + * Return next transaction element of type. + * @param tei transaction element iterator + * @return next transaction element of type, NULL on termination + */ +/*@unused@*/ static inline /*@dependent@*/ /*@null@*/ +transactionElement teNext(teIterator tei, enum rpmTransactionType type) + /*@modifies tei @*/ +{ + transactionElement p; + + while ((p = teNextIterator(tei)) != NULL) { + if (p->type == type) + break; + } + return p; +} #endif /* defined(_NEED_TEITERATOR) */ /** diff --git a/lib/psm.c b/lib/psm.c index c17ed7a..0d26c70 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -1200,7 +1200,8 @@ rpmRC rpmInstallSourcePackage(rpmTransactionSet ts, goto exit; } - (void) rpmtransAddPackage(ts, h, fd, NULL, 0, NULL); + /* XXX don't bother with fd, linked directly into fi below. */ + (void) rpmtransAddPackage(ts, h, NULL, NULL, 0, NULL); fi->type = TR_ADDED; @@ -1212,11 +1213,19 @@ rpmRC rpmInstallSourcePackage(rpmTransactionSet ts, } fi->multiLib = 0; /* MULTILIB for src.rpm's? */ + +#ifdef DYING /*@-kepttrans@*/ fi->key = alGetKey(ts->addedPackages, pkgKey); /*@=kepttrans@*/ fi->relocs = alGetRelocs(ts->addedPackages, pkgKey); fi->fd = alGetFd(ts->addedPackages, pkgKey); +#else + fi->key = NULL; + /* XXX don't bother with fd, linked directly into fi below. */ +/*@i@*/ fi->fd = fd; + fi->relocs = NULL; +#endif /* XXX header arg unused. */ loadFi(ts, fi, fi->h, 1); diff --git a/lib/psm.h b/lib/psm.h index a485af9..2c3f35f 100644 --- a/lib/psm.h +++ b/lib/psm.h @@ -52,9 +52,10 @@ struct transactionFileInfo_s { uint_32 multiLib; /* MULTILIB */ /*@null@*/ const void * key; /*!< Package notify key. */ -/*@null@*/ +/*@null@*/ /*@dependent@*/ rpmRelocation * relocs; /*!< Package file relocations. */ -/*@null@*/ FD_t fd; /*!< Package file handle */ +/*@null@*/ + FD_t fd; /*!< Package file handle */ /*=============================*/ diff --git a/lib/rpmal.c b/lib/rpmal.c index f9a49f9..45dc5e2 100644 --- a/lib/rpmal.c +++ b/lib/rpmal.c @@ -45,6 +45,7 @@ struct availablePackage_s { const char * version; /*!< Header version. */ /*@dependent@*/ const char * release; /*!< Header release. */ + /*@owned@*/ /*@null@*/ rpmDepSet provides; /*!< Provides: dependencies. */ /*@owned@*/ /*@null@*/ @@ -54,13 +55,11 @@ struct availablePackage_s { /*@dependent@*//*@null@*/ int_32 * epoch; /*!< Header epoch (if any). */ int filesCount; /*!< No. of files in header. */ + #ifdef DYING uint_32 multiLib; /* MULTILIB */ #endif -/*@kept@*//*@null@*/ - const void * key; /*!< Private data associated with a package (e.g. file name of package). */ -/*@null@*/ rpmRelocation * relocs; -/*@null@*/ FD_t fd; + }; /** \ingroup rpmdep @@ -153,7 +152,6 @@ static inline alNum alKey2Num(/*@unused@*/ /*@null@*/ const availableList al, /*@=nullret =temptrans =retalias @*/ } -/*@unused@*/ static inline alKey alNum2Key(/*@unused@*/ /*@null@*/ const availableList al, /*@null@*/ alNum pkgNum) /*@*/ @@ -179,15 +177,6 @@ fprintf(stderr, "*** alp[%d] %p\n", pkgNum, alp); return alp; } -const void * alGetKey(const availableList al, alKey pkgKey) -{ - availablePackage alp = alGetPkg(al, pkgKey); - - /*@-retexpose@*/ - return (alp != NULL ? alp->key : NULL); - /*@=retexpose@*/ -} - #ifdef DYING int alGetMultiLib(const availableList al, alKey pkgKey) { @@ -233,51 +222,6 @@ Header alGetHeader(availableList al, alKey pkgKey, int unlink) return h; } -rpmRelocation * alGetRelocs(const availableList al, alKey pkgKey) -{ - availablePackage alp = alGetPkg(al, pkgKey); - rpmRelocation * relocs = NULL; - - if (alp != NULL) { - relocs = alp->relocs; - alp->relocs = NULL; - } - return relocs; -} - -FD_t alGetFd(availableList al, alKey pkgKey) -{ - availablePackage alp = alGetPkg(al, pkgKey); - FD_t fd = NULL; - - if (alp != NULL) { - /*@-refcounttrans@*/ - fd = alp->fd; - alp->fd = NULL; - /*@=refcounttrans@*/ - } - /*@-refcounttrans@*/ -/*@i@*/ return fd; - /*@=refcounttrans@*/ -} - -#ifdef DYING -alNum alGetPkgIndex(const availableList al, const availablePackage alp) -{ - alNum pkgNum = alKey2Num(al, RPMAL_NOMATCH); - if (al != NULL) { - if (al->list != NULL) - if (alp != NULL && alp >= al->list && alp < (al->list + al->size)) - pkgNum = ((alNum)(alp - al->list)); - } -/*@-modfilesys@*/ -if (_al_debug) -fprintf(stderr, "*** alp %p[%d]\n", alp, (int)pkgNum); -/*@=modfilesys@*/ - return pkgNum; -} -#endif /* DYING */ - char * alGetNVR(const availableList al, alKey pkgKey) { availablePackage alp = alGetPkg(al, pkgKey); @@ -298,17 +242,6 @@ char * alGetNVR(const availableList al, alKey pkgKey) return pkgNVR; } -#ifdef DYING -void alProblemSetAppend(const availableList al, const availablePackage alp, - rpmProblemSet tsprobs, rpmProblemType type, - const char * dn, const char * bn, - const char * altNEVR, unsigned long ulong1) -{ - rpmProblemSetAppend(tsprobs, type, alGetNVR(al, alp), - alp->key, dn, bn, altNEVR, ulong1); -} -#endif - availableList alCreate(int delta) { availableList al = xcalloc(1, sizeof(*al)); @@ -330,7 +263,6 @@ availableList alFree(availableList al) { HFD_t hfd = headerFreeData; availablePackage p; - rpmRelocation * r; int i; if (al == NULL) @@ -345,17 +277,6 @@ availableList alFree(availableList al) p->baseNames = hfd(p->baseNames, -1); p->h = headerFree(p->h, "alFree"); - if (p->relocs) { - for (r = p->relocs; (r->oldPath || r->newPath); r++) { - r->oldPath = _free(r->oldPath); - r->newPath = _free(r->newPath); - } - p->relocs = _free(p->relocs); - } - /*@-type@*/ /* FIX: cast? */ - if (p->fd != NULL) - p->fd = fdFree(p->fd, "alAddPackage (alFree)"); - /*@=type@*/ } if (al->dirs != NULL) @@ -409,21 +330,6 @@ if (_al_debug) fprintf(stderr, "*** del %p[%d] %s-%s-%s\n", al->list, pkgNum, alp->name, alp->version, alp->release); /*@=modfilesys@*/ - if (alp->relocs) { - rpmRelocation * r; - for (r = alp->relocs; r->oldPath || r->newPath; r++) { - r->oldPath = _free(r->oldPath); - r->newPath = _free(r->newPath); - } - alp->relocs = _free(alp->relocs); - } - if (alp->fd) { - /*@-type@*/ /* FIX: cast? */ - (void) fdFree(alp->fd, "alDelPackage"); - /*@=type@*/ - alp->fd = NULL; - } - if (alp->baseNames != NULL && alp->filesCount > 0) { int origNumDirs = al->numDirs; const char ** dirNames; @@ -488,9 +394,7 @@ fprintf(stderr, "*** del %p[%d] %s-%s-%s\n", al->list, pkgNum, alp->name, alp->v /*@=nullstate@*/ } -alKey alAddPackage(availableList al, alKey pkgKey, - Header h, /*@null@*/ /*@dependent@*/ const void * key, - /*@null@*/ FD_t fd, /*@null@*/ rpmRelocation * relocs) +alKey alAddPackage(availableList al, alKey pkgKey, Header h) /*@modifies al, h @*/ { int scareMem = 1; @@ -499,7 +403,7 @@ alKey alAddPackage(availableList al, alKey pkgKey, rpmTagType dnt, bnt; availablePackage alp; alNum pkgNum = alKey2Num(al, pkgKey); - int i, xx; + int xx; #ifdef DYING uint_32 multiLibMask = 0; uint_32 * pp = NULL; @@ -638,30 +542,6 @@ fprintf(stderr, "*** add %p[%d] %s-%s-%s\n", al->list, pkgNum, alp->name, alp->v } - /*@-assignexpose@*/ - alp->key = key; - /*@=assignexpose@*/ - /*@-type@*/ /* FIX: cast? */ - alp->fd = (fd != NULL ? fdLink(fd, "alAddPackage") : NULL); - /*@=type@*/ - - if (relocs) { - rpmRelocation * r; - - for (i = 0, r = relocs; r->oldPath || r->newPath; i++, r++) - {}; - alp->relocs = xmalloc((i + 1) * sizeof(*alp->relocs)); - - for (i = 0, r = relocs; r->oldPath || r->newPath; i++, r++) { - alp->relocs[i].oldPath = r->oldPath ? xstrdup(r->oldPath) : NULL; - alp->relocs[i].newPath = r->newPath ? xstrdup(r->newPath) : NULL; - } - alp->relocs[i].oldPath = NULL; - alp->relocs[i].newPath = NULL; - } else { - alp->relocs = NULL; - } - /*@-compdef@*/ /* FIX: al->list->relocs-?{oldPath,newPath} undefined */ alFreeIndex(al); /*@=compdef@*/ @@ -794,18 +674,11 @@ alKey * alAllFileSatisfiesDepend(const availableList al, const rpmDepSet ds) /*@innercontinue@*/ continue; #endif -#ifdef DYING - /* XXX FIXME: use dsiNotify */ - if (keyType) - rpmMessage(RPMMESS_DEBUG, _("%9s: %-45s YES (added files)\n"), - keyType, fileName); -#else dsiNotify(ds, _("(added files)"), 0); -#endif ret = xrealloc(ret, (found+2) * sizeof(*ret)); if (ret) /* can't happen */ - ret[found++] = al->list + dirMatch->files[i].pkgNum; + ret[found++] = alNum2Key(al, dirMatch->files[i].pkgNum); /*@innerbreak@*/ break; } } diff --git a/lib/rpmal.h b/lib/rpmal.h index 2717df7..d0aa0c3 100644 --- a/lib/rpmal.h +++ b/lib/rpmal.h @@ -11,42 +11,6 @@ */ typedef /*@abstract@*/ struct availablePackage_s * availablePackage; -#ifdef DYING -/** \ingroup rpmdep - * Info about a single package to be installed. - */ -struct availablePackage_s { -/*@refcounted@*/ - Header h; /*!< Package header. */ -/*@dependent@*/ - const char * name; /*!< Header name. */ -/*@dependent@*/ - const char * version; /*!< Header version. */ -/*@dependent@*/ - const char * release; /*!< Header release. */ -/*@owned@*/ /*@null@*/ - rpmDepSet provides; /*!< Provides: dependencies. */ -/*@owned@*/ /*@null@*/ - rpmDepSet requires; /*!< Requires: dependencies. */ -/*@owned@*//*@null@*/ - const char ** baseNames; /*!< Header file basenames. */ -/*@dependent@*//*@null@*/ - int_32 * epoch; /*!< Header epoch (if any). */ - int filesCount; /*!< No. of files in header. */ -#ifdef DYING - uint_32 multiLib; /* MULTILIB */ -#endif -/*@kept@*//*@null@*/ - const void * key; /*!< Private data associated with a package (e.g. file name of package). */ -/*@null@*/ rpmRelocation * relocs; -/*@null@*/ FD_t fd; -}; -#endif - -#ifdef __cplusplus -extern "C" { -#endif - /** * Return number of packages in list. * @param al available list @@ -55,16 +19,6 @@ extern "C" { int alGetSize(const availableList al) /*@*/; -/** - * Return available package identifier key. - * @param al available list - * @param pkgKey available package key - * @return available identifier key - */ -/*@kept@*/ /*@null@*/ -const void * alGetKey(/*@null@*/ const availableList al, /*@null@*/alKey pkgKey) - /*@*/; - #ifdef DYING /** * Return available package multiLib flag. @@ -117,28 +71,6 @@ Header alGetHeader(/*@null@*/ availableList al, /*@null@*/ alKey pkgKey, /*@modifies al @*/; /** - * Return available package relocations. - * @warning alp->relocs set to NULL after call. - * @param al available list - * @param pkgKey available package key - * @return available package relocations - */ -/*@null@*/ -rpmRelocation * alGetRelocs(/*@null@*/ availableList al, /*@null@*/ alKey pkgKey) - /*@modifies al @*/; - -/** - * Return available package file handle. - * @warning alp->fd set to NULL after call. - * @param al available list - * @param pkgKey available package key - * @return available package file handle - */ -/*@null@*/ -FD_t alGetFd(/*@null@*/ availableList al, /*@null@*/ alKey pkgKey) - /*@modifies al @*/; - -/** * Return available package. * @param al available list * @param pkgKey available package key @@ -150,17 +82,6 @@ availablePackage alGetPkg(/*@null@*/ availableList al, /*@null@*/ alKey pkgKey) /*@*/; /*@=exportlocal@*/ -#ifdef DYING -/** - * Return available package index. - * @param al available list - * @param alp available package pointer - * @return available package index, -1 on failure - */ -alNum alGetPkgIndex(/*@null@*/ const availableList al, const availablePackage alp) - /*@*/; -#endif - /** * Return (malloc'd) available package name-version-release string. * @param al available list @@ -171,19 +92,6 @@ alNum alGetPkgIndex(/*@null@*/ const availableList al, const availablePackage al char * alGetNVR(/*@null@*/const availableList al, /*@null@*/ alKey pkgKey) /*@*/; -#ifdef DYING -/** - * Append available package problem to set. - */ -/*@unused@*/ -void alProblemSetAppend(const availableList al, const availablePackage alp, - rpmProblemSet tsprobs, rpmProblemType type, - const char * dn, const char * bn, - /*@only@*/ /*@null@*/ const char * altNEVR, - unsigned long ulong1) - /*@modifies tsprobs @*/; -#endif - /** * Initialize available packckages, items, and directory list. * @param delta no. of entries to add on each realloc @@ -217,14 +125,9 @@ void alDelPackage(availableList al, /*@null@*/ alKey pkgKey) * @param al available list * @param pkgKey package key, RPMAL_NOMATCH to force an append * @param h package header - * @param key package private data - * @param fd package file handle - * @param relocs package file relocations * @return available package index */ -alKey alAddPackage(availableList al, /*@null@*/ alKey pkgKey, - Header h, /*@null@*/ /*@dependent@*/ const void * key, - /*@null@*/ FD_t fd, /*@null@*/ rpmRelocation * relocs) +alKey alAddPackage(availableList al, /*@null@*/ alKey pkgKey, Header h) /*@modifies al, h @*/; /** diff --git a/lib/rpmds.c b/lib/rpmds.c index f6da052..c15b095 100644 --- a/lib/rpmds.c +++ b/lib/rpmds.c @@ -24,11 +24,9 @@ rpmDepSet dsFree(rpmDepSet ds) /*@-modfilesystem@*/ if (_ds_debug) -fprintf(stderr, "*** ds %p --\n", ds); +fprintf(stderr, "*** ds %p -- %s[%d]\n", ds, ds->Type, ds->Count); /*@=modfilesystem@*/ - if (ds == NULL) - return ds; if (ds->tagN == RPMTAG_PROVIDENAME) { tagEVR = RPMTAG_PROVIDEVERSION; @@ -248,7 +246,8 @@ int dsiNext(/*@null@*/ rpmDepSet ds) ds->DNEVR = dsDNEVR(t, ds); /*@=nullstate@*/ - } + } else + ds->i = -1; } /*@-modfilesystem -nullderef -nullpass @*/ diff --git a/lib/rpmlib.h b/lib/rpmlib.h index ffc2a44..495893f 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -1426,6 +1426,7 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, /*@null@*/ FD_t fd, /** \ingroup rpmtrans * Add package to universe of possible packages to install in transaction set. + * @warning The key parameter is non-functional. * @param ts transaction set * @param h header * @param key package private data diff --git a/lib/transaction.c b/lib/transaction.c index 4b881ba..b4b2f08 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -123,7 +123,11 @@ int rpmtransGetKeys(const rpmTransactionSet ts, const void *** ep, int * nep) for (oc = 0; oc < ts->orderCount; oc++, e++) { switch (ts->order[oc].type) { case TR_ADDED: +#ifdef DYING *e = alGetKey(ts->addedPackages, ts->order[oc].u.addedKey); +#else + *e = ts->order[oc].key; +#endif /*@switchbreak@*/ break; default: case TR_REMOVED: @@ -927,11 +931,13 @@ int rpmRunTransactions( rpmTransactionSet ts, int nexti; alKey pkgKey, lastKey; int oc; + transactionElement p; fingerPrintCache fpc; struct psm_s psmbuf; PSM_t psm = &psmbuf; teIterator tei; int xx; + int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ /* FIXME: what if the same package is included in ts twice? */ @@ -1027,21 +1033,30 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ * - count files. */ /* The ordering doesn't matter here */ - for (i = 0; i < alGetSize(ts->addedPackages); i++) { +#ifdef DYING + for (i = 0; i < alGetSize(ts->addedPackages); i++) +#else + tei = teInitIterator(ts); + while ((p = teNext(tei, TR_ADDED)) != NULL) +#endif + { const char * n, * v, * r; const void * key; rpmdbMatchIterator mi; Header h; - /* XXX cast assumes that available keys are indices, not pointers */ - pkgKey = (alKey)i; + pkgKey = p->u.addedKey; h = alGetHeader(ts->addedPackages, pkgKey, 0); if (h == NULL) /* XXX can't happen */ continue; (void) headerNVR(h, &n, &v, &r); +#ifdef DYING key = alGetKey(ts->addedPackages, pkgKey); +#else + key = p->key; +#endif if (!archOkay(h) && !(ts->ignoreSet & RPMPROB_FILTER_IGNOREARCH)) rpmProblemSetAppend(ts->probs, RPMPROB_BADARCH, @@ -1085,6 +1100,7 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ h = headerFree(h, "alGetHeader (rpmtsRun sanity)"); } + tei = teFreeIterator(tei); /* FIXME: it seems a bit silly to read in all of these headers twice */ /* The ordering doesn't matter here */ @@ -1134,11 +1150,18 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ #else fi->multiLib = ts->order[oc].multiLib; #endif + +#ifdef DYING /*@-kepttrans@*/ fi->key = alGetKey(ts->addedPackages, pkgKey); /*@=kepttrans@*/ fi->relocs = alGetRelocs(ts->addedPackages, pkgKey); fi->fd = alGetFd(ts->addedPackages, pkgKey); +#else +/*@i@*/ fi->key = ts->order[oc].key; + fi->relocs = ts->order[oc].relocs; +/*@i@*/ fi->fd = ts->order[oc].fd; +#endif /* XXX availablePackage can be dumped here XXX */ diff --git a/po/cs.po b/po/cs.po index 74ba025..5a72fdf 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: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-0500\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -831,7 +831,7 @@ msgstr "Nemohu p msgid "Could not open %s: %s\n" msgstr "Nemohu otevøít %s: %s\n" -#: build/pack.c:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "Nemohu zapsat balíèek: %s\n" @@ -861,7 +861,7 @@ msgstr "Nemohu p msgid "Unable to write payload to %s: %s\n" msgstr "Nemohu zapsat payload do %s: %s\n" -#: build/pack.c:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "Zapsáno: %s\n" @@ -1432,99 +1432,99 @@ msgstr "" msgid " failed - " msgstr "selhal - " -#: lib/depends.c:113 +#: lib/depends.c:115 #, c-format msgid "cannot open Packages database in %s\n" msgstr "nemohu otevøít databázi balíèkù v %s\n" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "balíèek %s je ji¾ nainstalován" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s ANO (rpmrc poskytuje)\n" -#: lib/depends.c:645 +#: lib/depends.c:675 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s ANO (rpmlib poskytuje)\n" -#: lib/depends.c:666 +#: lib/depends.c:696 #, fuzzy msgid "(db files)" msgstr "¹patný db soubor %s\n" -#: lib/depends.c:678 +#: lib/depends.c:708 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s ANO (db poskytuje)\n" -#: lib/depends.c:691 +#: lib/depends.c:721 #, fuzzy msgid "(db package)" msgstr "¾ádné balíèky\n" -#: lib/depends.c:730 +#: lib/depends.c:760 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) pøidáno do ke¹e závislostí.\n" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "NE " -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "ANO" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "========== ukládání tsort relací\n" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== tsorting balíèkù (poøadí, #pøedchùdce, #následovník, hloubka)\n" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "SMYÈKA:\n" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "========== pokraèuje tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2263,60 +2263,60 @@ msgstr "nemohu zapsat do %%%s %s\n" msgid "source package expected, binary found\n" msgstr "oèekávám balíèek se zdrojovými kódy, nalezen v¹ak binární\n" -#: lib/psm.c:1321 +#: lib/psm.c:1330 msgid "source package contains no .spec file\n" msgstr "zdrojový balíèek neobsahuje .spec soubor\n" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: spou¹tím %s skript(y) (pokud existují)\n" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "provedení skripletu %s z %s-%s-%s selhalo, návratový kód byl: %s\n" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "provedení %s skripletu z %s-%s-%s selhalo, návratový kód: %d\n" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s obsahuje %d souborù, test = %d\n" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "%s: scriptlet %s selhal (%d), pøeskakuji %s-%s-%s\n" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, 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:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ita skupina root\n" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalování archívu selhalo %s%s: %s\n" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr " na souboru " -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nemohu otevøít %s: %s\n" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s selhalo\n" @@ -2443,17 +2443,12 @@ msgstr "z msgid "package %s is not installed\n" msgstr "balíèek %s není nainstalován\n" -#: lib/rpmal.c:800 -#, fuzzy, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "%s: %-45s ANO (pøidány soubory)\n" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 #, fuzzy msgid "(added files)" msgstr "¹patný db soubor %s\n" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s ANO (db poskytuje)\n" @@ -2522,7 +2517,7 @@ msgid "OK" msgstr "OK" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2531,13 +2526,13 @@ msgstr "" "Závislost \"B\" potøebuje období (pøedpokládáno stejné jako \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n" @@ -2870,13 +2865,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Podpisu: velikost(%d)+vata(%d)\n" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, 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:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "vynechávám adresáø %s\n" @@ -3417,6 +3412,10 @@ msgstr "url port mus msgid "failed to create %s: %s\n" msgstr "nemohu vytvoøit %s: %s\n" +#, fuzzy +#~ msgid "%9s: %-45s YES (added files)\n" +#~ msgstr "%s: %-45s ANO (pøidány soubory)\n" + #~ msgid "package %s conflicts: %s\n" #~ msgstr "balíèek %s koliduje: %s\n" diff --git a/po/da.po b/po/da.po index c4f9bbd..475a875 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: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-0500\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -828,7 +828,7 @@ msgstr "Kunne ikke l msgid "Could not open %s: %s\n" msgstr "Kunne ikke åbne %s: %s\n" -#: build/pack.c:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunne ikke skrive pakke: %s\n" @@ -858,7 +858,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:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1433,99 +1433,99 @@ msgstr "" msgid " failed - " msgstr " mislykkedes - " -#: lib/depends.c:113 +#: lib/depends.c:115 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kunne ikke åbne Packages-database i %s\n" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "pakken %s er allerede installeret" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s JA (rpmrc tilfører)\n" -#: lib/depends.c:645 +#: lib/depends.c:675 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s JA (rpmlib tilfører)\n" -#: lib/depends.c:666 +#: lib/depends.c:696 #, fuzzy msgid "(db files)" msgstr "ugyldig db-fil %s\n" -#: lib/depends.c:678 +#: lib/depends.c:708 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s JA (db tilfører)\n" -#: lib/depends.c:691 +#: lib/depends.c:721 #, fuzzy msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:730 +#: lib/depends.c:760 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) tilføjet til afhængigheds-buffer.\n" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 #, fuzzy msgid "NO " msgstr "IKKE O.K." -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "fjerne %s-%s-%s \"%s\" fra tsort-relationer.\n" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "========== gemmer tsort-relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "LØKKE:\n" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "========== fortsætter tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2282,62 +2282,62 @@ msgstr "kunne ikke skrive til %s\n" msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binær fundet\n" -#: lib/psm.c:1321 +#: lib/psm.c:1330 msgid "source package contains no .spec file\n" msgstr "kildepakke indeholder ingen .spec-fil\n" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "kører postinstallations-skript (hvis det findes)\n" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" "kørsel af småskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" "kørsel af småskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "pakke: %s-%s-%s filer test = %d\n" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "bruger %s eksisterer ikke - bruger root\n" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "gruppe %s eksisterer ikke - bruger root\n" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "udpakning af arkiv mislykkedes%s%s: %s\n" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr " for fil " -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s mislykkedes\n" @@ -2464,17 +2464,12 @@ msgstr "post %d kunne ikke l msgid "package %s is not installed\n" msgstr "pakken %s er ikke installeret\n" -#: lib/rpmal.c:800 -#, fuzzy, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "%s: %-45s JA (tilføjede filer)\n" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 #, fuzzy msgid "(added files)" msgstr "ugyldig db-fil %s\n" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s JA (db tilfører)\n" @@ -2543,7 +2538,7 @@ msgid "OK" msgstr "O.K." #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2552,13 +2547,13 @@ msgstr "" "\"B\"-afhængighed kræver en epoke (antager samme som \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" @@ -2892,13 +2887,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signaturfyld : %d\n" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s oversprunget grundet manglende ok-flag\n" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer kataloget %s\n" @@ -3446,6 +3441,10 @@ msgstr "url-port skal v msgid "failed to create %s: %s\n" msgstr "kunne ikke oprette %s: %s\n" +#, fuzzy +#~ msgid "%9s: %-45s YES (added files)\n" +#~ msgstr "%s: %-45s JA (tilføjede filer)\n" + #~ msgid "package %s conflicts: %s\n" #~ msgstr "pakke %s skaber konflikt: %s\n" diff --git a/po/de.po b/po/de.po index 3399646..72594b5 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: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-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:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, 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:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1568,100 +1568,100 @@ msgstr "" msgid " failed - " msgstr "pgp fehlgeschlagen" -#: lib/depends.c:113 +#: lib/depends.c:115 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "Paket %s ist nicht installiert\n" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 #, fuzzy msgid "(rpmrc provides)" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:645 +#: lib/depends.c:675 #, fuzzy msgid "(rpmlib provides)" msgstr "die Datei »%s« gehört zu keinem Paket\n" # , c-format -#: lib/depends.c:666 +#: lib/depends.c:696 #, fuzzy msgid "(db files)" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/depends.c:678 +#: lib/depends.c:708 #, fuzzy msgid "(db provides)" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:691 +#: lib/depends.c:721 #, fuzzy msgid "(db package)" msgstr "Anfrage an alle Pakete" -#: lib/depends.c:730 +#: lib/depends.c:760 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" # FIXME -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2457,63 +2457,63 @@ msgstr "kann Datei %s nicht msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1321 +#: lib/psm.c:1330 #, fuzzy msgid "source package contains no .spec file\n" msgstr "Anfrage nach Paket, das die Datei besitzt" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "Keine Stufen ausführen" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "Ausführung des Skripts fehlgeschlagen" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "Ausführung des Skripts fehlgeschlagen" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp fehlgeschlagen" @@ -2645,18 +2645,13 @@ msgstr "Eintrag %d konnte nicht gelesen werden\n" msgid "package %s is not installed\n" msgstr "Paket %s ist nicht installiert\n" -#: lib/rpmal.c:800 -#, fuzzy, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "die Datei »%s« gehört zu keinem Paket\n" - # , c-format -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 #, fuzzy msgid "(added files)" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 #, fuzzy msgid "(added provide)" msgstr "die Datei »%s« gehört zu keinem Paket\n" @@ -2727,20 +2722,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" @@ -3090,13 +3085,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" @@ -3651,6 +3646,10 @@ msgid "failed to create %s: %s\n" msgstr "anlegen von %s fehlgeschlagen\n" #, fuzzy +#~ msgid "%9s: %-45s YES (added files)\n" +#~ msgstr "die Datei »%s« gehört zu keinem Paket\n" + +#, fuzzy #~ msgid "package %s conflicts: %s\n" #~ msgstr "Paket %s wird nicht in %s aufgeführt" diff --git a/po/en_RN.po b/po/en_RN.po index 7e81fe1..6c95abf 100644 --- a/po/en_RN.po +++ b/po/en_RN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,93 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:113 +#: lib/depends.c:115 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:645 +#: lib/depends.c:675 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:666 +#: lib/depends.c:696 msgid "(db files)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:708 msgid "(db provides)" msgstr "" -#: lib/depends.c:691 +#: lib/depends.c:721 msgid "(db package)" msgstr "" -#: lib/depends.c:730 +#: lib/depends.c:760 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2218,60 +2218,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1321 +#: lib/psm.c:1330 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2398,16 +2398,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:800 -#, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 msgid "(added files)" msgstr "" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 msgid "(added provide)" msgstr "" @@ -2475,20 +2470,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2817,13 +2812,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/es.po b/po/es.po index 7e81fe1..6c95abf 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,93 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:113 +#: lib/depends.c:115 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:645 +#: lib/depends.c:675 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:666 +#: lib/depends.c:696 msgid "(db files)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:708 msgid "(db provides)" msgstr "" -#: lib/depends.c:691 +#: lib/depends.c:721 msgid "(db package)" msgstr "" -#: lib/depends.c:730 +#: lib/depends.c:760 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2218,60 +2218,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1321 +#: lib/psm.c:1330 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2398,16 +2398,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:800 -#, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 msgid "(added files)" msgstr "" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 msgid "(added provide)" msgstr "" @@ -2475,20 +2470,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2817,13 +2812,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/eu_ES.po b/po/eu_ES.po index 7e81fe1..6c95abf 100644 --- a/po/eu_ES.po +++ b/po/eu_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,93 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:113 +#: lib/depends.c:115 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:645 +#: lib/depends.c:675 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:666 +#: lib/depends.c:696 msgid "(db files)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:708 msgid "(db provides)" msgstr "" -#: lib/depends.c:691 +#: lib/depends.c:721 msgid "(db package)" msgstr "" -#: lib/depends.c:730 +#: lib/depends.c:760 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2218,60 +2218,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1321 +#: lib/psm.c:1330 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2398,16 +2398,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:800 -#, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 msgid "(added files)" msgstr "" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 msgid "(added provide)" msgstr "" @@ -2475,20 +2470,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2817,13 +2812,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/fi.po b/po/fi.po index 115783f..cbadcba 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: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-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:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, 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:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1451,98 +1451,98 @@ msgstr "" msgid " failed - " msgstr "pgp epäonnistui" -#: lib/depends.c:113 +#: lib/depends.c:115 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "virhe: en voi avata %s%s/packages.rpm\n" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 #, fuzzy msgid "(rpmrc provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:645 +#: lib/depends.c:675 #, fuzzy msgid "(rpmlib provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:666 +#: lib/depends.c:696 #, fuzzy msgid "(db files)" msgstr "en voinut avata %s: %s" -#: lib/depends.c:678 +#: lib/depends.c:708 #, fuzzy msgid "(db provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:691 +#: lib/depends.c:721 #, fuzzy msgid "(db package)" msgstr "kysele kaikki paketit" -#: lib/depends.c:730 +#: lib/depends.c:760 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2316,61 +2316,61 @@ msgstr "en voinut avata tiedostoa %s: " msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1321 +#: lib/psm.c:1330 #, fuzzy msgid "source package contains no .spec file\n" msgstr "kysy pakettia, jonka omistuksessa on" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "älä suorita mitään vaiheita" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "skriptin ajo epäonnistui" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "skriptin ajo epäonnistui" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp epäonnistui" @@ -2500,17 +2500,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:800 -#, fuzzy, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "tiedostoa %s ei omista mikään paketti\n" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 #, fuzzy msgid "(added files)" msgstr "en voinut avata %s: %s" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 #, fuzzy msgid "(added provide)" msgstr "tiedostoa %s ei omista mikään paketti\n" @@ -2581,20 +2576,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "paketti %s ei ole %s:ssä" @@ -2939,13 +2934,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" @@ -3491,6 +3486,10 @@ msgid "failed to create %s: %s\n" msgstr "%s:n luonti epäonnistui\n" #, fuzzy +#~ msgid "%9s: %-45s YES (added files)\n" +#~ msgstr "tiedostoa %s ei omista mikään paketti\n" + +#, fuzzy #~ msgid "package %s conflicts: %s\n" #~ msgstr "paketti %s ei ole %s:ssä" diff --git a/po/fr.po b/po/fr.po index d5e4ada..6538534 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: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-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:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, 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:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1491,95 +1491,95 @@ msgstr "" msgid " failed - " msgstr "La construction a chou.\n" -#: lib/depends.c:113 +#: lib/depends.c:115 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:645 +#: lib/depends.c:675 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:666 +#: lib/depends.c:696 #, fuzzy msgid "(db files)" msgstr "impossible d'ouvrir: %s\n" -#: lib/depends.c:678 +#: lib/depends.c:708 msgid "(db provides)" msgstr "" -#: lib/depends.c:691 +#: lib/depends.c:721 #, fuzzy msgid "(db package)" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/depends.c:730 +#: lib/depends.c:760 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "impossible d'ouvrir: %s\n" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2366,62 +2366,62 @@ msgstr "impossible d'ouvrir: %s\n" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1321 +#: lib/psm.c:1330 #, fuzzy msgid "source package contains no .spec file\n" msgstr "" " -f + - interroge le package qui appartient " -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "La construction a chou.\n" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "La construction a chou.\n" @@ -2551,17 +2551,12 @@ msgstr "" msgid "package %s is not installed\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpmal.c:800 -#, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 #, fuzzy msgid "(added files)" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 msgid "(added provide)" msgstr "" @@ -2630,20 +2625,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -2984,13 +2979,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/gl.po b/po/gl.po index b57521e..09d5bba 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: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-0500\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -811,7 +811,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -841,7 +841,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1405,93 +1405,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:113 +#: lib/depends.c:115 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:645 +#: lib/depends.c:675 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:666 +#: lib/depends.c:696 msgid "(db files)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:708 msgid "(db provides)" msgstr "" -#: lib/depends.c:691 +#: lib/depends.c:721 msgid "(db package)" msgstr "" -#: lib/depends.c:730 +#: lib/depends.c:760 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2213,60 +2213,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1321 +#: lib/psm.c:1330 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2393,16 +2393,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:800 -#, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 msgid "(added files)" msgstr "" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 msgid "(added provide)" msgstr "" @@ -2470,20 +2465,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2812,13 +2807,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/hu.po b/po/hu.po index 7e81fe1..6c95abf 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,93 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:113 +#: lib/depends.c:115 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:645 +#: lib/depends.c:675 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:666 +#: lib/depends.c:696 msgid "(db files)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:708 msgid "(db provides)" msgstr "" -#: lib/depends.c:691 +#: lib/depends.c:721 msgid "(db package)" msgstr "" -#: lib/depends.c:730 +#: lib/depends.c:760 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2218,60 +2218,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1321 +#: lib/psm.c:1330 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2398,16 +2398,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:800 -#, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 msgid "(added files)" msgstr "" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 msgid "(added provide)" msgstr "" @@ -2475,20 +2470,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2817,13 +2812,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/id.po b/po/id.po index 7e81fe1..6c95abf 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,93 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:113 +#: lib/depends.c:115 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:645 +#: lib/depends.c:675 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:666 +#: lib/depends.c:696 msgid "(db files)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:708 msgid "(db provides)" msgstr "" -#: lib/depends.c:691 +#: lib/depends.c:721 msgid "(db package)" msgstr "" -#: lib/depends.c:730 +#: lib/depends.c:760 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2218,60 +2218,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1321 +#: lib/psm.c:1330 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2398,16 +2398,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:800 -#, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 msgid "(added files)" msgstr "" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 msgid "(added provide)" msgstr "" @@ -2475,20 +2470,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2817,13 +2812,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/is.po b/po/is.po index 6782986..8df41d7 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: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-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:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, 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:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "Skrifaði: %s\n" @@ -1410,94 +1410,94 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:113 +#: lib/depends.c:115 #, c-format msgid "cannot open Packages database in %s\n" msgstr "get ekki opnað pakka gagnagrunn í\n" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:645 +#: lib/depends.c:675 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:666 +#: lib/depends.c:696 msgid "(db files)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:708 msgid "(db provides)" msgstr "" -#: lib/depends.c:691 +#: lib/depends.c:721 #, fuzzy msgid "(db package)" msgstr "uppfæra pakka" -#: lib/depends.c:730 +#: lib/depends.c:760 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2224,60 +2224,60 @@ msgstr "get ekki rita msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1321 +#: lib/psm.c:1330 msgid "source package contains no .spec file\n" msgstr "pakkinn inniheldur enga .spec skrá\n" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "gat ekki opnað %s: %s\n" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s brást\n" @@ -2404,16 +2404,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:800 -#, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 msgid "(added files)" msgstr "" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 msgid "(added provide)" msgstr "" @@ -2481,20 +2476,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2823,13 +2818,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/it.po b/po/it.po index 7e81fe1..6c95abf 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,93 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:113 +#: lib/depends.c:115 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:645 +#: lib/depends.c:675 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:666 +#: lib/depends.c:696 msgid "(db files)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:708 msgid "(db provides)" msgstr "" -#: lib/depends.c:691 +#: lib/depends.c:721 msgid "(db package)" msgstr "" -#: lib/depends.c:730 +#: lib/depends.c:760 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2218,60 +2218,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1321 +#: lib/psm.c:1330 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2398,16 +2398,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:800 -#, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 msgid "(added files)" msgstr "" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 msgid "(added provide)" msgstr "" @@ -2475,20 +2470,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2817,13 +2812,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index 46c105d..2445589 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: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-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:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, 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:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "½ñ¤­¹þ¤ßÃæ: %s\n" @@ -1483,98 +1483,98 @@ msgstr "" msgid " failed - " msgstr "¼ºÇÔ - " -#: lib/depends.c:113 +#: lib/depends.c:115 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:645 +#: lib/depends.c:675 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:666 +#: lib/depends.c:696 #, fuzzy msgid "(db files)" msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" -#: lib/depends.c:678 +#: lib/depends.c:708 #, fuzzy msgid "(db provides)" msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:691 +#: lib/depends.c:721 #, fuzzy msgid "(db package)" msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Þ¤·¤¿\n" -#: lib/depends.c:730 +#: lib/depends.c:760 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2375,62 +2375,62 @@ msgstr "%s msgid "source package expected, binary found\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Þ¤¹¡¢¥Ð¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Þ¤·¤¿" -#: lib/psm.c:1321 +#: lib/psm.c:1330 #, fuzzy msgid "source package contains no .spec file\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "¥Ý¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "¥æ¡¼¥¶ %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "¥°¥ë¡¼¥× %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿­Ä¹¤Ë¼ºÇÔ %s%s: %s" -#: lib/psm.c:2230 +#: lib/psm.c:2239 #, fuzzy msgid " on file " msgstr "¥Õ¥¡¥¤¥ë¾å" -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s ¼ºÇÔ" @@ -2559,17 +2559,12 @@ msgstr " msgid "package %s is not installed\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: lib/rpmal.c:800 -#, fuzzy, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "%s: %s ¤Ï¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 #, fuzzy msgid "(added files)" msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 #, fuzzy msgid "(added provide)" msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" @@ -2640,7 +2635,7 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2649,13 +2644,13 @@ msgstr "" "\"B\" ¤Î°Í¸À­¤Ï epoch ¤òɬÍפȤ·¤Þ¤¹(\"A\"¤ÈƱ¤¸¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n" @@ -2999,13 +2994,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "½ð̾¥Ñ¥Ã¥É: %d\n" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n" @@ -3564,6 +3559,10 @@ msgstr "url msgid "failed to create %s: %s\n" msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" +#, fuzzy +#~ msgid "%9s: %-45s YES (added files)\n" +#~ msgstr "%s: %s ¤Ï¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" + #~ msgid "package %s conflicts: %s\n" #~ msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹: %s\n" diff --git a/po/ko.po b/po/ko.po index 6b4f8ad..69700f1 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: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-0500\n" "PO-Revision-Date: 2001-09-07 22:03+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -822,7 +822,7 @@ msgstr " msgid "Could not open %s: %s\n" msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "ÆÐÅ°Áö¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n" @@ -852,7 +852,7 @@ msgstr "%s msgid "Unable to write payload to %s: %s\n" msgstr "%s ¿¡ payload¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "ÀÛ¼º: %s\n" @@ -1423,99 +1423,99 @@ msgstr " msgid " failed - " msgstr " ½ÇÆÐÇÔ - " -#: lib/depends.c:113 +#: lib/depends.c:115 #, c-format msgid "cannot open Packages database in %s\n" msgstr "%s ¾ÈÀÇ ÆÐÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "%s ÆÐÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s ¿¹ (rpmrcÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:645 +#: lib/depends.c:675 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s ¿¹ (rpmlibÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:666 +#: lib/depends.c:696 #, fuzzy msgid "(db files)" msgstr "À߸øµÈ db ÆÄÀÏ %s\n" -#: lib/depends.c:678 +#: lib/depends.c:708 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n" -#: lib/depends.c:691 +#: lib/depends.c:721 #, fuzzy msgid "(db package)" msgstr "ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/depends.c:730 +#: lib/depends.c:760 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) ÀÇÁ¸(Depends) ij½Ã¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù.\n" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "¾Æ´Ï¿À" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "¿¹" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort °ü°è¿¡¼­ %s-%s-%s \"%s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== ÆÐÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼­, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, ±íÀÌ[depth])\n" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "========== ÈÄÀÓÀÚ [successors only] (Ç¥Çö ¼ø)\n" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "·çÇÁ(LOOP):\n" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2263,66 +2263,66 @@ msgstr "%%%s %s ( msgid "source package expected, binary found\n" msgstr "¼Ò½º ÆÐÅ°Áö°¡ ¿ä±¸µË´Ï´Ù, ¹ÙÀ̳ʸ®¸¦ ã¾Ò½À´Ï´Ù\n" -#: lib/psm.c:1321 +#: lib/psm.c:1330 msgid "source package contains no .spec file\n" msgstr "¼Ò½º ÆÐÅ°Áö¿¡ .spec ÆÄÀÏÀÌ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: %s ½ºÅ©¸³Æ®¸¦ ½ÇÇàÇÕ´Ï´Ù (ÀÖÀ» °æ¿ì)\n" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" "%2$s-%3$s-%4$s ÀÇ %1$s ½ºÅ©¸³Æ®¸´(scriptlet) ½ÇÇà¿¡ ½ÇÆÐÇß½À´Ï´Ù, waitpid°¡ %" "5$s (À»)¸¦ ¹ÝȯÇÏ¿´½À´Ï´Ù \n" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" "%2$s-%3$s-%4$s ÀÇ %1$s ½ºÅ©¸³Æ®¸´(scriptlet) ½ÇÇà¿¡ ½ÇÆÐÇß½À´Ï´Ù, Á¾·á »óȲ %" "5$d\n" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s (ÀÌ)°¡ %d ÀÇ ÆÄÀÏÀ» °®°í ÀÖ½À´Ï´Ù, Å×½ºÆ® = %d\n" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" "%s: %s ½ºÅ©¸³Æ®¸´(scriptlet)°¡ ½ÇÆÐÇß½À´Ï´Ù (%d), %s-%s-%s (À»)¸¦ »ý·«ÇÕ´Ï" "´Ù\n" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "%s »ç¿ëÀÚ°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "%s ±×·ìÀÌ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¾ÆÄ«À̺긦 Ǫ´Âµ¥ ½ÇÆÐÇÔ%s%s: %s\n" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr " ´ÙÀ½ ÆÄÀÏ¿¡ " -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%2$s ÆÄÀÏÀÇ %1$s (ÀÌ)°¡ ½ÇÆÐÇÔ: %3$s\n" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, c-format msgid "%s failed: %s\n" msgstr "%s (ÀÌ)°¡ ½ÇÆÐÇÔ: %s\n" @@ -2449,17 +2449,12 @@ msgstr " msgid "package %s is not installed\n" msgstr "%s ÆÐÅ°Áö´Â ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/rpmal.c:800 -#, fuzzy, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "%s: %-45s ¿¹ (ÆÄÀÏÀÌ Ãß°¡µÊ)\n" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 #, fuzzy msgid "(added files)" msgstr "À߸øµÈ db ÆÄÀÏ %s\n" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n" @@ -2528,7 +2523,7 @@ msgid "OK" msgstr "È®ÀÎ" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2537,13 +2532,13 @@ msgstr "" "\"B\" ÀÇÁ¸¼ºÀº Áß¿ä½Ã µÇ´Â °Í(epoch)À» ÇÊ¿ä·Î ÇÕ´Ï´Ù (\"A\" ·Î °¡Á¤ÇÕ´Ï´Ù)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "%s-%s-%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n" @@ -2875,13 +2870,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "¼­¸í: size(%d)+pad(%d)\n" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "missingok Ç÷¡±×·Î ÀÎÇØ %s (À»)¸¦ »ý·«ÇÕ´Ï´Ù\n" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "%s µð·ºÅ丮¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" @@ -3430,6 +3425,10 @@ msgstr "URL msgid "failed to create %s: %s\n" msgstr "%s (À»)¸¦ »ý¼ºÇϴµ¥ ½ÇÆÐÇÔ: %s\n" +#, fuzzy +#~ msgid "%9s: %-45s YES (added files)\n" +#~ msgstr "%s: %-45s ¿¹ (ÆÄÀÏÀÌ Ãß°¡µÊ)\n" + #~ msgid "package %s conflicts: %s\n" #~ msgstr "ÆÐÅ°Áö %s (ÀÌ)°¡ Ãæµ¹ÇÔ: %s\n" diff --git a/po/no.po b/po/no.po index 126d0ce..11356b8 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: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-0500\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -825,7 +825,7 @@ msgstr "Kunne ikke msgid "Could not open %s: %s\n" msgstr "Kunne ikke åpne %s: %s\n" -#: build/pack.c:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunne ikke skrive pakke: %s\n" @@ -855,7 +855,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:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1424,94 +1424,94 @@ msgstr "" msgid " failed - " msgstr " feilet - " -#: lib/depends.c:113 +#: lib/depends.c:115 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kan ikke åpne pakkedatabase i %s\n" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "pakke %s er allerede installert" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:645 +#: lib/depends.c:675 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:666 +#: lib/depends.c:696 msgid "(db files)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:708 msgid "(db provides)" msgstr "" -#: lib/depends.c:691 +#: lib/depends.c:721 #, fuzzy msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:730 +#: lib/depends.c:760 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "NEI" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "JA" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2246,60 +2246,60 @@ msgstr "kan ikke skrive til %%%s %s\n" msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binær funnet\n" -#: lib/psm.c:1321 +#: lib/psm.c:1330 msgid "source package contains no .spec file\n" msgstr "kildepakke inneholder ikke en .spec-fil\n" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: kjører %s-skript (hvis noen)\n" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "klarte ikke å åpne %s: %s\n" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s feilet\n" @@ -2426,16 +2426,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "pakke %s er ikke installert\n" -#: lib/rpmal.c:800 -#, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 msgid "(added files)" msgstr "" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 msgid "(added provide)" msgstr "" @@ -2503,20 +2498,20 @@ msgid "OK" msgstr "OK" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "pakke %s er i konflikt: %s\n" @@ -2847,13 +2842,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer katalog %s\n" diff --git a/po/pl.po b/po/pl.po index b22d5ac..74dc701 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: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-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:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, 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:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -1465,99 +1465,99 @@ msgstr "" msgid " failed - " msgstr " nie powiod³o siê -" -#: lib/depends.c:113 +#: lib/depends.c:115 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 #, fuzzy msgid "(rpmrc provides)" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:645 +#: lib/depends.c:675 #, fuzzy msgid "(rpmlib provides)" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:666 +#: lib/depends.c:696 #, fuzzy msgid "(db files)" msgstr "b³êdny status pliku: %s" -#: lib/depends.c:678 +#: lib/depends.c:708 #, fuzzy msgid "(db provides)" msgstr "Udostêpniane zasoby:" -#: lib/depends.c:691 +#: lib/depends.c:721 #, fuzzy msgid "(db package)" msgstr "znaleziono %d pakietów\n" -#: lib/depends.c:730 +#: lib/depends.c:760 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 #, fuzzy msgid "NO " msgstr "NIE DOBRZE" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "usuwanie indeksu grupy\n" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2333,61 +2333,61 @@ msgstr "nie mo msgid "source package expected, binary found\n" msgstr "spodziewany pakiet ¼ród³owy a nie binarny" -#: lib/psm.c:1321 +#: lib/psm.c:1330 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pakiet ¼ród³owy nie zawiera pliku .spec" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "wykonanie skryptu nie powiod³o siê" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "wykonanie skryptu nie powiod³o siê" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "pakiet: %s-%s-%s test plików = %d\n" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, 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:2188 +#: lib/psm.c:2197 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s nie istnieje - u¿yto grupy root" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, 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:2230 +#: lib/psm.c:2239 msgid " on file " msgstr " na pliku " -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nie mo¿na otworzyæ %s: %s" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s nie powiod³o siê" @@ -2516,17 +2516,12 @@ msgstr "nie mo msgid "package %s is not installed\n" msgstr "pakiet %s nie jest zainstalowany\n" -#: lib/rpmal.c:800 -#, fuzzy, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 #, fuzzy msgid "(added files)" msgstr "b³êdny status pliku: %s" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 #, fuzzy msgid "(added provide)" msgstr "Udostêpniane zasoby:" @@ -2596,20 +2591,20 @@ msgid "OK" msgstr "OK" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, fuzzy, c-format msgid " %s A %s\tB %s\n" msgstr " rpm {--version}" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n" @@ -2952,13 +2947,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Blok sygnatury: %d\n" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s pominiêty z powodu flagi missingok\n" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "tworzenie katalogu: %s\n" @@ -3506,6 +3501,10 @@ msgstr "port musi by msgid "failed to create %s: %s\n" msgstr "utworzenie %s nie powiod³o siê\n" +#, fuzzy +#~ msgid "%9s: %-45s YES (added files)\n" +#~ msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" + #~ msgid "package %s conflicts: %s\n" #~ msgstr "pakiet %s jest w konflikcie: %s\n" diff --git a/po/pt.po b/po/pt.po index ff8c455..4747658 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: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-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" @@ -823,7 +823,7 @@ msgstr "N msgid "Could not open %s: %s\n" msgstr "Não consigo aceder ao %s: %s\n" -#: build/pack.c:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "Não consegui gravar o pacote: %s\n" @@ -853,7 +853,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:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "Gravei: %s\n" @@ -1420,99 +1420,99 @@ msgstr "" msgid " failed - " msgstr " falhou - " -#: lib/depends.c:113 +#: lib/depends.c:115 #, c-format msgid "cannot open Packages database in %s\n" msgstr "não consigo abrir a base de dados Packages em %s\n" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "o pacote %s já está instalado" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s SIM (oferecidos pelo rpmrc)\n" -#: lib/depends.c:645 +#: lib/depends.c:675 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s SIM (oferecidos pela rpmlib)\n" -#: lib/depends.c:666 +#: lib/depends.c:696 #, fuzzy msgid "(db files)" msgstr "ficheiro db inválido %s\n" -#: lib/depends.c:678 +#: lib/depends.c:708 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s SI (oferecidos pelo db)\n" -#: lib/depends.c:691 +#: lib/depends.c:721 #, fuzzy msgid "(db package)" msgstr "nenhum pacote\n" -#: lib/depends.c:730 +#: lib/depends.c:760 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) adicionado à cache de dependências.\n" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 #, fuzzy msgid "NO " msgstr "NÃO-OK" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "a remover o %s-%s-%s \"%s\" das relações do tsort.\n" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "=========== a guardar as relações do tsort\n" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "========== só os sucessores (ordem de apresentação)\n" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "CICLO:\n" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "========== a prosseguir o tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2260,60 +2260,60 @@ msgstr "n msgid "source package expected, binary found\n" msgstr "esperava-se um pacote com código-fonte, foi encontrado um pacote binário\n" -#: lib/psm.c:1321 +#: lib/psm.c:1330 msgid "source package contains no .spec file\n" msgstr "o pacote de código-fonte não contem um ficheiro .spec\n" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "a correr os programas de pós-instalação (se existirem)\n" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "a execução do 'scriptlet' %s do %s-%s-%s falhou com código de erro %d\n" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "a execução do 'scriptlet' %s do %s-%s-%s falhou com código de erro %d\n" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "pacote: teste dos ficheiros do %s-%s-%s = %d\n" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, 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:2188 +#: lib/psm.c:2197 #, 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:2229 +#: lib/psm.c:2238 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "a abertura do pacote falhou%s%s: %s\n" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr " no ficheiro " -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "falhei ao aceder ao %s: %s\n" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "O %s falhou\n" @@ -2440,17 +2440,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:800 -#, fuzzy, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "%s: %-45s SIM (ficheiros adicionados)\n" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 #, fuzzy msgid "(added files)" msgstr "ficheiro db inválido %s\n" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s SI (oferecidos pelo db)\n" @@ -2519,7 +2514,7 @@ msgid "OK" msgstr "OK" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2528,13 +2523,13 @@ msgstr "" "A dependência \"B\" precisa duma época (assumindo a mesma que \"A\")\n" "\t %s\tB %s\n" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "requisito %s-%s-%s do pacote não satisfeito: %s\n" @@ -2866,13 +2861,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "'Pad' ou preenchimento da assinatura: %d\n" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ignorado devido à opção missingok\n" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "a excluir a directoria %s\n" @@ -3409,6 +3404,10 @@ 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" +#, fuzzy +#~ msgid "%9s: %-45s YES (added files)\n" +#~ msgstr "%s: %-45s SIM (ficheiros adicionados)\n" + #~ msgid "package %s conflicts: %s\n" #~ msgstr "o pacote %s está em conflito: %s\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 6702b40..a5d5325 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: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-0500\n" #: build.c:36 #, fuzzy @@ -911,7 +911,7 @@ msgid "Could not open %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "No consegui abrir: %s\n" @@ -946,7 +946,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:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1578,97 +1578,97 @@ msgid " failed - " msgstr "Construo falhou.\n" # , c-format -#: lib/depends.c:113 +#: lib/depends.c:115 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "No consegui abrir: %s\n" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "no foi passado pacote para instalao" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:645 +#: lib/depends.c:675 msgid "(rpmlib provides)" msgstr "" # , c-format -#: lib/depends.c:666 +#: lib/depends.c:696 #, fuzzy msgid "(db files)" msgstr "No consegui abrir: %s\n" -#: lib/depends.c:678 +#: lib/depends.c:708 msgid "(db provides)" msgstr "" -#: lib/depends.c:691 +#: lib/depends.c:721 #, fuzzy msgid "(db package)" msgstr "pesquise todos os pacotes" -#: lib/depends.c:730 +#: lib/depends.c:760 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" # , c-format -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "No consegui abrir: %s\n" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2483,62 +2483,62 @@ msgstr "No consegui abrir: %s\n" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1321 +#: lib/psm.c:1330 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pesquise o pacote ao qual pertence" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "no execute nenhum estgio" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "no foi passado pacote para instalao" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "Construo falhou.\n" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "Construo falhou.\n" @@ -2670,18 +2670,13 @@ msgstr "" msgid "package %s is not installed\n" msgstr "no foi passado pacote para instalao" -#: lib/rpmal.c:800 -#, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "" - # , c-format -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 #, fuzzy msgid "(added files)" msgstr "No consegui abrir: %s\n" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 msgid "(added provide)" msgstr "" @@ -2753,20 +2748,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "no foi passado pacote para instalao" @@ -3131,7 +3126,7 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3145,7 +3140,7 @@ msgstr "" # "Content-Transfer-Encoding: 8-bit\n" # , c-format #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "RPM verso %s\n" diff --git a/po/ro.po b/po/ro.po index d674006..63b5924 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: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-0500\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -811,7 +811,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -841,7 +841,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1405,93 +1405,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:113 +#: lib/depends.c:115 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:645 +#: lib/depends.c:675 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:666 +#: lib/depends.c:696 msgid "(db files)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:708 msgid "(db provides)" msgstr "" -#: lib/depends.c:691 +#: lib/depends.c:721 msgid "(db package)" msgstr "" -#: lib/depends.c:730 +#: lib/depends.c:760 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2213,60 +2213,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1321 +#: lib/psm.c:1330 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2393,16 +2393,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:800 -#, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 msgid "(added files)" msgstr "" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 msgid "(added provide)" msgstr "" @@ -2470,20 +2465,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2812,13 +2807,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index 534619d..39d2e07 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,93 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:113 +#: lib/depends.c:115 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:645 +#: lib/depends.c:675 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:666 +#: lib/depends.c:696 msgid "(db files)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:708 msgid "(db provides)" msgstr "" -#: lib/depends.c:691 +#: lib/depends.c:721 msgid "(db package)" msgstr "" -#: lib/depends.c:730 +#: lib/depends.c:760 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2218,60 +2218,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1321 +#: lib/psm.c:1330 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2398,16 +2398,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:800 -#, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 msgid "(added files)" msgstr "" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 msgid "(added provide)" msgstr "" @@ -2475,20 +2470,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2817,13 +2812,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 315ad34..2db3df3 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: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-0500\n" "PO-Revision-Date: 2001-08-29 13:55-0400\n" "Last-Translator: Eugene Kanter \n" "Language-Team: Black Cat Linux Team \n" @@ -834,7 +834,7 @@ msgstr " msgid "Could not open %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: build/pack.c:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÐÁËÅÔ: %s\n" @@ -864,7 +864,7 @@ msgstr " msgid "Unable to write payload to %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÓÏÄÅÒÖÉÍÏÅ × %s: %s\n" -#: build/pack.c:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "úÁÐÉÓÁÎ: %s\n" @@ -1441,100 +1441,100 @@ msgstr " msgid " failed - " msgstr "ÎÅ ÕÄÁÌÏÓØ - " -#: lib/depends.c:113 +#: lib/depends.c:115 #, c-format msgid "cannot open Packages database in %s\n" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "ÐÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s YES (rpmrc provides)\n" -#: lib/depends.c:645 +#: lib/depends.c:675 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s YES (rpmlib provides)\n" -#: lib/depends.c:666 +#: lib/depends.c:696 #, fuzzy msgid "(db files)" msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n" -#: lib/depends.c:678 +#: lib/depends.c:708 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s YES (db provides)\n" -#: lib/depends.c:691 +#: lib/depends.c:721 #, fuzzy msgid "(db package)" msgstr "ÎÅÔ ÐÁËÅÔÏ×\n" -#: lib/depends.c:730 +#: lib/depends.c:760 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) ÄÏÂÁ×ÌÅÎÏ × ËÅÛ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "îåT" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "äá" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "========== ÚÁÐÉÓØ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== ÓÏÒÔÉÒÏ×ËÁ ÐÁËÅÔÏ× (ÏÞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, " "ÇÌÕÂÉÎÁ)\n" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "========== ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌÉ (× ÐÏÒÑÄËÅ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ)\n" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "ãéëì:\n" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "========== ÐÒÏÄÏÌÖÅÎÉÅ ÕÐÏÒÑÄÏÞÅÎÉÑ ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2276,60 +2276,60 @@ msgstr " msgid "source package expected, binary found\n" msgstr "ÏÂÎÁÒÕÖÅÎ Ä×ÏÉÞÎÙÊ ÐÁËÅÔ ×ÍÅÓÔÏ ÏÖÉÄÁÅÍÏÇÏ ÉÓÈÏÄÎÏÇÏ\n" -#: lib/psm.c:1321 +#: lib/psm.c:1330 msgid "source package contains no .spec file\n" msgstr "ÉÓÈÏÄÎÙÊ ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ\n" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: ×ÙÐÏÌÎÑÅÔÓÑ ÓÃÅÎÁÒÉÊ %s (ÅÓÌÉ ÅÓÔØ)\n" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "ÏÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ÓÃÅÎÁÒÉÑ %s ÉÚ %s-%s-%s, waitpid() ×ÏÚ×ÒÁÔÉÌ %s\n" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "ÏÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ÓÃÅÎÁÒÉÑ %s ÉÚ %s-%s-%s, ËÏÄ ×ÏÚ×ÒÁÔÁ %d\n" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s ÓÏÄÅÒÖÉÔ %d ÆÁÊÌÏ×, test = %d\n" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "%s: ÏÛÉÂËÁ ÓÃÅÎÁÒÉÑ %s (%d), %s-%s-%s ÐÒÏÐÕÓËÁÅÔÓÑ\n" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "ÐÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "ÇÒÕÐÐÁ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "ÒÁÓÐÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s\n" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr " ÎÁ ÆÁÊÌÅ " -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ÏÛÉÂËÁ ÎÁ ÆÁÊÌÅ %s: %s\n" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, c-format msgid "%s failed: %s\n" msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n" @@ -2456,17 +2456,12 @@ msgstr " msgid "package %s is not installed\n" msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" -#: lib/rpmal.c:800 -#, fuzzy, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "%s: %-45s YES (added files)\n" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 #, fuzzy msgid "(added files)" msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s YES (db provides)\n" @@ -2535,7 +2530,7 @@ msgid "OK" msgstr "Oë" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2544,13 +2539,13 @@ msgstr "" "ÄÌÑ ÚÁ×ÉÓÉÍÏÓÔÉ \"B\" ÎÕÖÎÏ ÕËÁÚÁÔØ \"epoch\" (ÔÁË ÖÅ ËÁË ÄÌÑ \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n" @@ -2883,13 +2878,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "ðÏÄÐÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁÐÏÌÎÅÎÉÅ(%d)\n" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ÐÒÏÐÕÝÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "ÉÓËÌÀÞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n" @@ -3435,6 +3430,10 @@ msgstr "url msgid "failed to create %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n" +#, fuzzy +#~ msgid "%9s: %-45s YES (added files)\n" +#~ msgstr "%s: %-45s YES (added files)\n" + #~ msgid "package %s conflicts: %s\n" #~ msgstr "ÐÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó: %s\n" diff --git a/po/sk.po b/po/sk.po index 8837b0b..d940038 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: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-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:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, 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:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "Zapísané: %s\n" @@ -1464,99 +1464,99 @@ msgstr "" msgid " failed - " msgstr " zlyhalo - " -#: lib/depends.c:113 +#: lib/depends.c:115 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "nie je mo¾né otvori» %s/packages.rpm\n" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 #, fuzzy msgid "(rpmrc provides)" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:645 +#: lib/depends.c:675 #, fuzzy msgid "(rpmlib provides)" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:666 +#: lib/depends.c:696 #, fuzzy msgid "(db files)" msgstr "chybný stav súboru: %s" -#: lib/depends.c:678 +#: lib/depends.c:708 #, fuzzy msgid "(db provides)" msgstr "Poskytuje:" -#: lib/depends.c:691 +#: lib/depends.c:721 #, fuzzy msgid "(db package)" msgstr "nájdených %d balíkov\n" -#: lib/depends.c:730 +#: lib/depends.c:760 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 #, fuzzy msgid "NO " msgstr "NIE JE V PORIADKU" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstraòuje sa index skupín\n" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2330,61 +2330,61 @@ msgstr "nie je mo msgid "source package expected, binary found\n" msgstr "oèakávaný zdrojový balík, nájdený binárny" -#: lib/psm.c:1321 +#: lib/psm.c:1330 #, fuzzy msgid "source package contains no .spec file\n" msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "vykonanie skriptu zlyhalo" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "vykonanie skriptu zlyhalo" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "balík: %s-%s-%s test súborov = %d\n" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "pou¾ívateµ %s neexistuje - pou¾ije sa root" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ije sa root" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalenie archívu zlyhalo%s%s: %s" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr " pre súbor " -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nepodarilo sa otvori» %s: %s" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s zlyhalo" @@ -2513,17 +2513,12 @@ msgstr "z msgid "package %s is not installed\n" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/rpmal.c:800 -#, fuzzy, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 #, fuzzy msgid "(added files)" msgstr "chybný stav súboru: %s" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 #, fuzzy msgid "(added provide)" msgstr "Poskytuje:" @@ -2593,20 +2588,20 @@ msgid "OK" msgstr "V PORIADKU" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, fuzzy, c-format msgid " %s A %s\tB %s\n" msgstr " rpm {--version}" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" @@ -2949,13 +2944,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Doplnenie podpisu: %d\n" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s vynechané kvôli príznaku missingok\n" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "vytvára sa adresár %s\n" @@ -3503,6 +3498,10 @@ msgstr "url port mus msgid "failed to create %s: %s\n" msgstr "nepodarilo sa vytvori» %s\n" +#, fuzzy +#~ msgid "%9s: %-45s YES (added files)\n" +#~ msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" + #~ msgid "package %s conflicts: %s\n" #~ msgstr "balík %s koliduje: %s\n" diff --git a/po/sl.po b/po/sl.po index 07e072a..478557e 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.191 2001/11/04 22:00:27 jbj Exp $ +# $Id: sl.po,v 1.192 2001/11/05 03:44:12 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-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:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, 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:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -1465,99 +1465,99 @@ msgstr "" msgid " failed - " msgstr " neuspe¹no - " -#: lib/depends.c:113 +#: lib/depends.c:115 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "zbirko podatkov paketov ni mo¾no odpreti v %s\n" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paket %s-%s-%s je ¾e name¹èen" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s DA (rpmrc ponudbe)\n" -#: lib/depends.c:645 +#: lib/depends.c:675 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s DA (rpmlib ponudbe)\n" -#: lib/depends.c:666 +#: lib/depends.c:696 #, fuzzy msgid "(db files)" msgstr "po¹kodovana zbirka podatkov %s" -#: lib/depends.c:678 +#: lib/depends.c:708 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s DA (db ponudbe)\n" -#: lib/depends.c:691 +#: lib/depends.c:721 #, fuzzy msgid "(db package)" msgstr "ni paketov\n" -#: lib/depends.c:730 +#: lib/depends.c:760 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 #, fuzzy msgid "NO " msgstr "NI DOBRO" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstranjujemo seznam skupin\n" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2329,61 +2329,61 @@ msgstr "pisanje na %s ni mo msgid "source package expected, binary found\n" msgstr "prièakovan je bil izvorni paket, najden binarni" -#: lib/psm.c:1321 +#: lib/psm.c:1330 #, fuzzy msgid "source package contains no .spec file\n" msgstr "izvorni paket ne vsebuje datoteke .spec" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "poganjanje ponamestitvenih skript (èe obstajajo)\n" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "skript se ni uspe¹no izvedel" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "skript se ni uspe¹no izvedel" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "paket: %s-%s-%s datoteke test = %d\n" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "uporabnik %s ne obstaja - uporabljam root" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s ne obstaja - uporabljam root" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, 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:2230 +#: lib/psm.c:2239 msgid " on file " msgstr " za datoteko " -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspe¹no odpiranje %s: %s\n" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s neuspe¹en" @@ -2512,17 +2512,12 @@ msgstr "zapisa %d ni mo msgid "package %s is not installed\n" msgstr "paket %s ni name¹èen\n" -#: lib/rpmal.c:800 -#, fuzzy, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "%s: %-45s DA (dodane datoteke)\n" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 #, fuzzy msgid "(added files)" msgstr "po¹kodovana zbirka podatkov %s" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s DA (db ponudbe)\n" @@ -2591,7 +2586,7 @@ msgid "OK" msgstr "V REDU" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2600,13 +2595,13 @@ msgstr "" "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" @@ -2947,13 +2942,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Dol¾. polnila : %d\n" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s preskoèen zaradi manjkajoèe zastavice OK\n" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "izkljuèevanje imenika %s\n" @@ -3506,6 +3501,10 @@ msgstr "vrata URL morajo biti msgid "failed to create %s: %s\n" msgstr "neuspe¹no ustvarjanje %s: %s\n" +#, fuzzy +#~ msgid "%9s: %-45s YES (added files)\n" +#~ msgstr "%s: %-45s DA (dodane datoteke)\n" + #~ msgid "package %s conflicts: %s\n" #~ msgstr "paket %s jw v sporu z: %s\n" diff --git a/po/sr.po b/po/sr.po index b20d878..67fea58 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: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-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:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, 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:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1449,98 +1449,98 @@ msgstr "" msgid " failed - " msgstr "PGP omanuo" -#: lib/depends.c:113 +#: lib/depends.c:115 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paket %s nije instaliran\n" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 #, fuzzy msgid "(rpmrc provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:645 +#: lib/depends.c:675 #, fuzzy msgid "(rpmlib provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:666 +#: lib/depends.c:696 #, fuzzy msgid "(db files)" msgstr "neuspelo otvaranje %s: %s" -#: lib/depends.c:678 +#: lib/depends.c:708 #, fuzzy msgid "(db provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:691 +#: lib/depends.c:721 #, fuzzy msgid "(db package)" msgstr "upit nad svim paketima" -#: lib/depends.c:730 +#: lib/depends.c:760 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2315,61 +2315,61 @@ msgstr "Ne mogu da otvorim datoteku %s: " msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1321 +#: lib/psm.c:1330 #, fuzzy msgid "source package contains no .spec file\n" msgstr "upit nad paketom koji ima " -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "nemoj izvr¹iti nijednu fazu" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "neuspelo izvr¹avanje skripta" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "neuspelo izvr¹avanje skripta" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "PGP omanuo" @@ -2499,17 +2499,12 @@ msgstr "ne mogu da pro msgid "package %s is not installed\n" msgstr "paket %s nije instaliran\n" -#: lib/rpmal.c:800 -#, fuzzy, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "datoteka %s ne pripada nijednom paketu\n" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 #, fuzzy msgid "(added files)" msgstr "neuspelo otvaranje %s: %s" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 #, fuzzy msgid "(added provide)" msgstr "datoteka %s ne pripada nijednom paketu\n" @@ -2580,20 +2575,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "paket %s nije naveden u %s" @@ -2938,13 +2933,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" @@ -3490,6 +3485,10 @@ msgid "failed to create %s: %s\n" msgstr "neuspelo kreiranje %s\n" #, fuzzy +#~ msgid "%9s: %-45s YES (added files)\n" +#~ msgstr "datoteka %s ne pripada nijednom paketu\n" + +#, fuzzy #~ msgid "package %s conflicts: %s\n" #~ msgstr "paket %s nije naveden u %s" diff --git a/po/sv.po b/po/sv.po index ff6cde6..a6350f3 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: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-0500\n" "PO-Revision-Date: 2001-09-12 14:18+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -825,7 +825,7 @@ msgstr "Kan inte l msgid "Could not open %s: %s\n" msgstr "Kunde inte öppna %s: %s\n" -#: build/pack.c:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunde inte skriva paket: %s\n" @@ -855,7 +855,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:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1426,99 +1426,99 @@ msgstr "Ingen arkivfilen i huvud" msgid " failed - " msgstr " misslyckades - " -#: lib/depends.c:113 +#: lib/depends.c:115 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kan inte öppna paketdatabas i %s\n" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paket %s är redan installerat" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n" -#: lib/depends.c:645 +#: lib/depends.c:675 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s JA (rpmlib tillhandahåller)\n" -#: lib/depends.c:666 +#: lib/depends.c:696 #, fuzzy msgid "(db files)" msgstr "felaktig db-fil %s\n" -#: lib/depends.c:678 +#: lib/depends.c:708 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s JA (db-tillhandahållande)\n" -#: lib/depends.c:691 +#: lib/depends.c:721 #, fuzzy msgid "(db package)" msgstr "inga paket\n" -#: lib/depends.c:730 +#: lib/depends.c:760 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) tillagt till beroendecachen.\n" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "NEJ " -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "JA" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tar bort %s-%s-%s \"%s\" från tsort-relationer.\n" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "========== noterar alla relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== tsort:erar paket (ordning, #föregångare, #efterföljare, djup)\n" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "========== endast efterföljare (presentationsordning)\n" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "LOOP:\n" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "========== fortsätter med tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2259,61 +2259,61 @@ msgstr "kan inte skriva till %%%s %s\n" msgid "source package expected, binary found\n" msgstr "källpaket förväntades, fann binärpaket\n" -#: lib/psm.c:1321 +#: lib/psm.c:1330 msgid "source package contains no .spec file\n" msgstr "källpaket innehåller ingen .spec-fil\n" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: kör (eventuellt) %s-skript\n" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" "körning av %s-skript från %s-%s-%s misslyckades, waitpid returnerade %s\n" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "körning av %s-skript från %s-%s-%s misslyckades, slutstatus %d\n" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s har %d filer, test = %d\n" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "%s: %s-skript misslyckades (%d), hoppar över %s-%s-%s\n" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "användare %s finns inte - använder root\n" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "grupp %s finns inte - använder root\n" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "uppackning av arkiv misslyckades%s%s: %s\n" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr " vid fil " -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s misslyckades på fil %s: %s\n" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, c-format msgid "%s failed: %s\n" msgstr "%s misslyckades: %s\n" @@ -2440,17 +2440,12 @@ msgstr "post %u kunde inte l msgid "package %s is not installed\n" msgstr "paket %s är inte installerat\n" -#: lib/rpmal.c:800 -#, fuzzy, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "%s: %-45s JA (lade till filer)\n" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 #, fuzzy msgid "(added files)" msgstr "felaktig db-fil %s\n" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s JA (db-tillhandahållande)\n" @@ -2519,7 +2514,7 @@ msgid "OK" msgstr "OK" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2528,13 +2523,13 @@ msgstr "" "\"B\"-beroendet behöver en epok (antar samma som \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n" @@ -2868,13 +2863,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s överhoppad på grund av missingok-flagga\n" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "hoppar över katalogen %s\n" @@ -3415,6 +3410,10 @@ msgstr "url-port m msgid "failed to create %s: %s\n" msgstr "kunde inte skapa %s: %s\n" +#, fuzzy +#~ msgid "%9s: %-45s YES (added files)\n" +#~ msgstr "%s: %-45s JA (lade till filer)\n" + #~ msgid "package %s conflicts: %s\n" #~ msgstr "paket %s står i konflikt: %s\n" diff --git a/po/tr.po b/po/tr.po index 6fd71be..93a2d93 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: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-0500\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -836,7 +836,7 @@ msgstr "%s'den ba msgid "Could not open %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: build/pack.c:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "paket yazýlamadý: %s\n" @@ -866,7 +866,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:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "Yazýldý: %s\n" @@ -1446,99 +1446,99 @@ msgstr "" msgid " failed - " msgstr " baþarýsýz - " -#: lib/depends.c:113 +#: lib/depends.c:115 #, c-format msgid "cannot open Packages database in %s\n" msgstr "%s de Paket veritabaný açýlamadý\n" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "%s zaten kurulu" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s EVET (rpmrc saðlar)\n" -#: lib/depends.c:645 +#: lib/depends.c:675 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s EVET (rpmlib saðlar)\n" -#: lib/depends.c:666 +#: lib/depends.c:696 #, fuzzy msgid "(db files)" msgstr "db dosyasý %s hatalý\n" -#: lib/depends.c:678 +#: lib/depends.c:708 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s EVET (db saðlar)\n" -#: lib/depends.c:691 +#: lib/depends.c:721 #, fuzzy msgid "(db package)" msgstr "paket yok\n" -#: lib/depends.c:730 +#: lib/depends.c:760 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) Baðýmlýlar alanýna eklendi.\n" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "HAYIR " -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "EVET" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort baðýntýlarýndan %s-%s-%s \"%s\" kaldýrýlýyor\n" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "========== tsort baðýntýlarý kaydediliyor\n" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== paketler tsort'lanýyor (sýra, #öncüller, #ardýllar, derinlik)\n" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "========== sadece ardýllar (sunum sýrasý)\n" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "ÇEVRÝM:\n" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "========== tsort sürüyor ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2283,60 +2283,60 @@ msgstr "%%%s dosyas msgid "source package expected, binary found\n" msgstr "kaynak paketi gerekirken çalýþtýrýlabilir paketi bulundu\n" -#: lib/psm.c:1321 +#: lib/psm.c:1330 msgid "source package contains no .spec file\n" msgstr "kaynak paketi .spec dosyasý içermiyor\n" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: %s betiði çalýþtýrýlýyor (varsa)\n" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "%s betiðinin %s-%s-%s'den icrasý baþarýsýz, waitpid sonucu %s\n" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "%s betiðinin %s-%s-%s'den icrasý baþarýsýz, çýkýþta durum %d\n" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s %d dosya içeriyor, test = %d\n" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "%s: %s betiði baþarýsýz (%d), %s-%s-%s atlanýyor\n" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "kullanýcý %s yok - root kullanýlacak\n" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "grup %s yok - root kullanýlacak\n" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, 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:2230 +#: lib/psm.c:2239 msgid " on file " msgstr " dosyada " -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s baþarýsýz\n" @@ -2463,17 +2463,12 @@ msgstr "%u. kay msgid "package %s is not installed\n" msgstr "%s paketi kurulu deðil\n" -#: lib/rpmal.c:800 -#, fuzzy, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "%s: %-45s EVET (dosyalar eklendi)\n" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 #, fuzzy msgid "(added files)" msgstr "db dosyasý %s hatalý\n" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s EVET (db saðlar)\n" @@ -2542,7 +2537,7 @@ msgid "OK" msgstr "Tamam" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, fuzzy, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2551,13 +2546,13 @@ msgstr "" "\"B\" baðýmlýlýðý bir dönemsellik gerektirir (tabii ki \"A\" da)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "paket %s-%s-%s gereksinimi tatmin edici deðil: %s\n" @@ -2889,13 +2884,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Ýmza: boyut(%d)+iz(%d)\n" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "missingok flamasýndan dolayý %s atlandý\n" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "%s dizini dýþlanýyor\n" @@ -3439,6 +3434,10 @@ msgstr "url portu bir say msgid "failed to create %s: %s\n" msgstr "%s oluþturulamadý: %s\n" +#, fuzzy +#~ msgid "%9s: %-45s YES (added files)\n" +#~ msgstr "%s: %-45s EVET (dosyalar eklendi)\n" + #~ msgid "package %s conflicts: %s\n" #~ msgstr "%s paketi çeliþiyor: %s\n" diff --git a/po/uk.po b/po/uk.po index 7e81fe1..6c95abf 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,93 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:113 +#: lib/depends.c:115 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:645 +#: lib/depends.c:675 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:666 +#: lib/depends.c:696 msgid "(db files)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:708 msgid "(db provides)" msgstr "" -#: lib/depends.c:691 +#: lib/depends.c:721 msgid "(db package)" msgstr "" -#: lib/depends.c:730 +#: lib/depends.c:760 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2218,60 +2218,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1321 +#: lib/psm.c:1330 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2398,16 +2398,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:800 -#, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 msgid "(added files)" msgstr "" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 msgid "(added provide)" msgstr "" @@ -2475,20 +2470,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2817,13 +2812,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/wa.po b/po/wa.po index 7e81fe1..6c95abf 100644 --- a/po/wa.po +++ b/po/wa.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,93 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:113 +#: lib/depends.c:115 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:645 +#: lib/depends.c:675 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:666 +#: lib/depends.c:696 msgid "(db files)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:708 msgid "(db provides)" msgstr "" -#: lib/depends.c:691 +#: lib/depends.c:721 msgid "(db package)" msgstr "" -#: lib/depends.c:730 +#: lib/depends.c:760 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2218,60 +2218,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1321 +#: lib/psm.c:1330 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2398,16 +2398,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:800 -#, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 msgid "(added files)" msgstr "" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 msgid "(added provide)" msgstr "" @@ -2475,20 +2470,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2817,13 +2812,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/zh.po b/po/zh.po index 7e81fe1..6c95abf 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,93 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:113 +#: lib/depends.c:115 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:645 +#: lib/depends.c:675 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:666 +#: lib/depends.c:696 msgid "(db files)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:708 msgid "(db provides)" msgstr "" -#: lib/depends.c:691 +#: lib/depends.c:721 msgid "(db package)" msgstr "" -#: lib/depends.c:730 +#: lib/depends.c:760 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2218,60 +2218,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1321 +#: lib/psm.c:1330 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2398,16 +2398,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:800 -#, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 msgid "(added files)" msgstr "" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 msgid "(added provide)" msgstr "" @@ -2475,20 +2470,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2817,13 +2812,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 7e81fe1..6c95abf 100644 --- a/po/zh_CN.GB2312.po +++ b/po/zh_CN.GB2312.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-04 16:55-0500\n" +"POT-Creation-Date: 2001-11-04 22:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2143 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2408 +#: build/pack.c:683 lib/psm.c:2417 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,93 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:113 +#: lib/depends.c:115 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:349 +#: lib/depends.c:333 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:354 +#: lib/depends.c:338 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:359 +#: lib/depends.c:343 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:604 +#: lib/depends.c:634 msgid "(cached)" msgstr "" -#: lib/depends.c:629 +#: lib/depends.c:659 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:645 +#: lib/depends.c:675 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:666 +#: lib/depends.c:696 msgid "(db files)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:708 msgid "(db provides)" msgstr "" -#: lib/depends.c:691 +#: lib/depends.c:721 msgid "(db package)" msgstr "" -#: lib/depends.c:730 +#: lib/depends.c:760 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "NO " msgstr "" -#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 +#: lib/depends.c:762 lib/rpmds.c:229 lib/rpmds.c:384 msgid "YES" msgstr "" -#: lib/depends.c:1076 +#: lib/depends.c:1114 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1323 +#: lib/depends.c:1366 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1397 +#: lib/depends.c:1440 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1472 +#: lib/depends.c:1515 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1576 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1568 +#: lib/depends.c:1611 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1573 +#: lib/depends.c:1616 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2218,60 +2218,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1321 +#: lib/psm.c:1330 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1431 +#: lib/psm.c:1440 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1599 +#: lib/psm.c:1608 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1606 +#: lib/psm.c:1615 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1948 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2065 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2179 +#: lib/psm.c:2188 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2197 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2229 +#: lib/psm.c:2238 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2230 +#: lib/psm.c:2239 msgid " on file " msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2425 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2428 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2398,16 +2398,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:800 -#, c-format -msgid "%9s: %-45s YES (added files)\n" -msgstr "" - -#: lib/rpmal.c:803 +#: lib/rpmal.c:677 msgid "(added files)" msgstr "" -#: lib/rpmal.c:907 +#: lib/rpmal.c:780 msgid "(added provide)" msgstr "" @@ -2475,20 +2470,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:355 +#: lib/rpmds.c:354 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:384 +#: lib/rpmds.c:383 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:410 +#: lib/rpmds.c:409 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2817,13 +2812,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:243 +#: lib/transaction.c:247 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:882 +#: lib/transaction.c:886 #, c-format msgid "excluding directory %s\n" msgstr "" -- 2.7.4