From 37a303a3a7d48d84c6750b51f8f5f2a62aaf659d Mon Sep 17 00:00:00 2001 From: jbj Date: Sun, 4 Nov 2001 22:00:11 +0000 Subject: [PATCH] - rpmal: availablePackage is totally opaque, alKey with index replaces. CVS patchset: 5155 CVS date: 2001/11/04 22:00:11 --- CHANGES | 1 + lib/depends.c | 149 ++++++++++-------------- lib/depends.h | 4 +- lib/problems.c | 5 +- lib/psm.c | 11 +- lib/rpmal.c | 327 +++++++++++++++++++++++++++++++++-------------------- lib/rpmal.h | 84 +++++++------- lib/rpmds.c | 63 ++++++----- lib/rpmds.h | 10 +- lib/rpmlib.h | 19 +++- lib/transaction.c | 36 +++--- po/cs.po | 135 +++++++++++----------- po/da.po | 135 +++++++++++----------- po/de.po | 136 +++++++++++----------- po/en_RN.po | 134 +++++++++++----------- po/es.po | 134 +++++++++++----------- po/eu_ES.po | 134 +++++++++++----------- po/fi.po | 135 +++++++++++----------- po/fr.po | 135 +++++++++++----------- po/gl.po | 134 +++++++++++----------- po/hu.po | 134 +++++++++++----------- po/id.po | 134 +++++++++++----------- po/is.po | 134 +++++++++++----------- po/it.po | 134 +++++++++++----------- po/ja.po | 135 +++++++++++----------- po/ko.po | 135 +++++++++++----------- po/no.po | 134 +++++++++++----------- po/pl.po | 135 +++++++++++----------- po/pt.po | 135 +++++++++++----------- po/pt_BR.po | 136 +++++++++++----------- po/ro.po | 134 +++++++++++----------- po/rpm.pot | 134 +++++++++++----------- po/ru.po | 135 +++++++++++----------- po/sk.po | 135 +++++++++++----------- po/sl.po | 137 +++++++++++----------- po/sr.po | 135 +++++++++++----------- po/sv.po | 135 +++++++++++----------- po/tr.po | 135 +++++++++++----------- po/uk.po | 134 +++++++++++----------- po/wa.po | 134 +++++++++++----------- po/zh.po | 134 +++++++++++----------- po/zh_CN.GB2312.po | 134 +++++++++++----------- python/rpmmodule.c | 4 +- rpm.spec | 1 + rpm.spec.in | 1 + 45 files changed, 2564 insertions(+), 2325 deletions(-) diff --git a/CHANGES b/CHANGES index fc2dbfb..fcc8cdb 100644 --- a/CHANGES +++ b/CHANGES @@ -44,6 +44,7 @@ - rpmds: create dsProblem(), dsiGetDNEVR() retrieved DNEVR, not N. - depends.h: hack around teIterator() et al from include for now. - rpmds: move trigger dependencies into a rpmDepSet as well. + - rpmal: availablePackage is totally opaque, alKey with index replaces. 4.0.3 -> 4.0.4: diff --git a/lib/depends.c b/lib/depends.c index 6283bb3..8854473 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -26,6 +26,7 @@ /*@access tsortInfo@*/ /*@access rpmTransactionSet@*/ +/*@access alKey @*/ /*@access rpmDependencyConflict@*/ /*@access problemsSet@*/ @@ -37,7 +38,7 @@ typedef /*@abstract@*/ struct orderListIndex_s * orderListIndex; /** */ struct orderListIndex_s { - int alIndex; + alKey pkgKey; int orIndex; }; @@ -205,10 +206,11 @@ static int intcmp(const void * a, const void * b) /*@*/ * Add removed package instance to ordered transaction set. * @param ts transaction set * @param dboffset rpm database instance - * @param depends installed package of pair (or -1 on erase) + * @param depends installed package of pair (or RPMAL_NOMATCH on erase) * @return 0 on success */ -static int removePackage(rpmTransactionSet ts, int dboffset, int depends) +static int removePackage(rpmTransactionSet ts, int dboffset, + alKey depends) /*@modifies ts @*/ { transactionElement p; @@ -242,7 +244,9 @@ static int removePackage(rpmTransactionSet ts, int dboffset, int depends) memset(p, 0, sizeof(*p)); p->type = TR_REMOVED; p->u.removed.dboffset = dboffset; - p->u.removed.dependsOnIndex = depends; + /*@-assignexpose -temptrans@*/ + p->u.removed.dependsOnKey = depends; + /*@=assignexpose =temptrans@*/ ts->orderCount++; return 0; @@ -292,10 +296,10 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd, const char * addNVR = hGetNVR(h, &name); const char * pkgNVR = NULL; int duplicate = 0; - int apx; /* addedPackages index */ transactionElement p; rpmDepSet obsoletes; - int alNum; + alKey pkgKey; /* addedPackages key */ + int apx; /* addedPackages index */ int xx; int ec = 0; int rc; @@ -323,7 +327,7 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd, apx++; - ph = alGetHeader(ts->addedPackages, p->u.addedIndex, 0); + ph = alGetHeader(ts->addedPackages, p->u.addedKey, 0); if (ph == NULL) break; @@ -364,15 +368,15 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd, ts->orderAlloced += ts->delta; ts->order = xrealloc(ts->order, ts->orderAlloced * sizeof(*ts->order)); } - alNum = alAddPackage(ts->addedPackages, apx, h, key, fd, relocs); - if (alNum == -1L) { + /* XXX cast assumes that available keys are indices, not pointers */ + pkgKey = alAddPackage(ts->addedPackages, (alKey)apx, h, key, fd, relocs); + if (pkgKey == RPMAL_NOMATCH) { ec = 1; goto exit; } p = ts->order + i; memset(p, 0, sizeof(*p)); -assert(alNum == apx); - p->u.addedIndex = alNum; + p->u.addedKey = pkgKey; p->type = TR_ADDED; p->multiLib = 0; @@ -426,7 +430,7 @@ assert(apx == ts->numAddedPackages); while((h2 = rpmdbNextIterator(mi)) != NULL) { /*@-branchstate@*/ if (rpmVersionCompare(h, h2)) - xx = removePackage(ts, rpmdbGetIteratorOffset(mi), alNum); + xx = removePackage(ts, rpmdbGetIteratorOffset(mi), pkgKey); else { uint_32 *pp, multiLibMask = 0, oldmultiLibMask = 0; @@ -473,7 +477,7 @@ assert(apx == ts->numAddedPackages); /*@-branchstate@*/ if (dsiGetEVR(obsoletes) == NULL || headerMatchesDepFlags(h2, obsoletes)) - xx = removePackage(ts, rpmdbGetIteratorOffset(mi), alNum); + xx = removePackage(ts, rpmdbGetIteratorOffset(mi), pkgKey); /*@=branchstate@*/ } mi = rpmdbFreeIterator(mi); @@ -493,13 +497,13 @@ exit: void rpmtransAvailablePackage(rpmTransactionSet ts, Header h, const void * key) { - /* XXX FIXME: return code -1L is error */ - (void) alAddPackage(ts->availablePackages, -1, h, key, NULL, NULL); + /* XXX FIXME: return code RPMAL_NOMATCH is error */ + (void) alAddPackage(ts->availablePackages, RPMAL_NOMATCH, h, key, NULL, NULL); } int rpmtransRemovePackage(rpmTransactionSet ts, int dboffset) { - return removePackage(ts, dboffset, -1); + return removePackage(ts, dboffset, RPMAL_NOMATCH); } /*@-nullstate@*/ /* FIX: better annotations */ @@ -555,21 +559,17 @@ rpmTransactionSet rpmtransFree(rpmTransactionSet ts) * @todo Eliminate rpmrc provides. * @param al available list * @param key dependency - * @retval suggestion possible package(s) to resolve dependency * @return 0 if satisfied, 1 if not satisfied, 2 if error */ -static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet key, - /*@null@*/ /*@out@*/ availablePackage ** suggestion) +static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet key) /*@globals _cacheDependsRC, fileSystem @*/ - /*@modifies ts, *suggestion, _cacheDependsRC, fileSystem @*/ + /*@modifies ts, _cacheDependsRC, fileSystem @*/ { rpmdbMatchIterator mi; const char * Name; Header h; int rc; - if (suggestion) *suggestion = NULL; - if ((Name = dsiGetN(key)) == NULL) return 0; /* XXX can't happen */ @@ -602,17 +602,6 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet key, if (rc >= 0) { dsiNotify(key, _("(cached)"), rc); - - /*@-mods -type@*/ /* FIX: hack to disable noisy debugging */ - if (suggestion && rc == 1) { - const char * Type = key->Type; - key->Type = NULL; - *suggestion = alAllSatisfiesDepend(ts->availablePackages, - key); - key->Type = Type; - } - /*@=mods =type@*/ - return rc; } } @@ -659,10 +648,9 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet key, goto unsatisfied; } - if (alSatisfiesDepend(ts->addedPackages, key) != -1L) - { + /* Search added packages for the dependency. */ + if (alSatisfiesDepend(ts->addedPackages, key) != RPMAL_NOMATCH) goto exit; - } /* XXX only the installer does not have the database open here. */ if (ts->rpmdb != NULL) { @@ -710,15 +698,6 @@ static int unsatisfiedDepend(rpmTransactionSet ts, rpmDepSet key, } - /*@-mods -type@*/ /* FIX: hack to disable noisy debugging */ - if (suggestion) { - const char * Type = key->Type; - key->Type = NULL; - *suggestion = alAllSatisfiesDepend(ts->availablePackages, key); - key->Type = Type; - } - /*@=mods =type@*/ - unsatisfied: rc = 1; /* dependency is unsatisfied */ dsiNotify(key, NULL, rc); @@ -779,7 +758,6 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp, int_32 Flags; int rc, xx; int ourrc = 0; - availablePackage * suggestion; xx = headerNVR(h, &name, &version, &release); @@ -801,33 +779,28 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp, if (multiLib && !isDependsMULTILIB(Flags)) continue; - rc = unsatisfiedDepend(ts, requires, &suggestion); + rc = unsatisfiedDepend(ts, requires); switch (rc) { case 0: /* requirements are satisfied. */ /*@switchbreak@*/ break; case 1: /* requirements are not satisfied. */ - { const void ** suggestedPkgs; + { const alKey * suggestedPkgs; - /*@-branchstate@*/ - if (suggestion != NULL) { - int j; - - for (j = 0; suggestion[j] != NULL; j++) - {}; - - suggestedPkgs = xmalloc( (j + 1) * sizeof(*suggestedPkgs) ); - for (j = 0; suggestion[j] != NULL; j++) - suggestedPkgs[j] = - alGetKey(ts->availablePackages, - alGetPkgIndex(ts->availablePackages, - suggestion[j])); - suggestedPkgs[j] = NULL; - } else { - suggestedPkgs = NULL; + suggestedPkgs = NULL; + + /*@-branchstate -mods -type@*/ /* FIX: hack to disable noise */ + if (ts->availablePackages != NULL) { + const char * Type = requires->Type; + requires->Type = NULL; + suggestedPkgs = + alAllSatisfiesDepend(ts->availablePackages, requires); + requires->Type = Type; } - /*@=branchstate@*/ + /*@=branchstate =mods =type@*/ + dsProblem(psp, h, requires, suggestedPkgs); + } /*@switchbreak@*/ break; case 2: /* something went wrong! */ @@ -856,7 +829,7 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp, if (multiLib && !isDependsMULTILIB(Flags)) continue; - rc = unsatisfiedDepend(ts, conflicts, NULL); + rc = unsatisfiedDepend(ts, conflicts); /* 1 == unsatisfied, 0 == satsisfied */ switch (rc) { @@ -1149,30 +1122,30 @@ static inline int addRelation(rpmTransactionSet ts, teIterator qi; transactionElement q; tsortInfo tsi; const char * Name; - long matchNum; + alKey pkgKey; int i = 0; - /*@-mods -type@*/ /* FIX: hack to disable noisy debugging */ + /*@-mods -type@*/ /* FIX: hack to disable noise */ { const char * Type = requires->Type; requires->Type = NULL; - matchNum = alSatisfiesDepend(ts->addedPackages, requires); + pkgKey = alSatisfiesDepend(ts->addedPackages, requires); requires->Type = Type; } /*@=mods =type@*/ /*@-nullpass@*/ if (_te_debug) -fprintf(stderr, "addRelation: matchNum %d\n", (int)matchNum); +fprintf(stderr, "addRelation: pkgKey %ld\n", (long)pkgKey); /*@=nullpass@*/ /* Ordering depends only on added package relations. */ - if (matchNum == -1L) + if (pkgKey == RPMAL_NOMATCH) return 0; -/* XXX Set q to the added package that has matchNum == q->u.addedIndex */ +/* XXX Set q to the added package that has pkgKey == q->u.addedKey */ /* XXX FIXME: bsearch is possible/needed here */ qi = teInitIterator(ts); while ((q = teNext(qi, TR_ADDED)) != NULL) { - if (matchNum == q->u.addedIndex) + if (pkgKey == q->u.addedKey) break; } qi = teFreeIterator(qi); @@ -1254,8 +1227,8 @@ prtTSI(NULL, &q->tsi); static int orderListIndexCmp(const void * one, const void * two) /*@*/ { /*@-castexpose@*/ - int a = ((const orderListIndex)one)->alIndex; - int b = ((const orderListIndex)two)->alIndex; + long a = (long) ((const orderListIndex)one)->pkgKey; + long b = (long) ((const orderListIndex)two)->pkgKey; /*@=castexpose@*/ return (a - b); } @@ -1304,7 +1277,7 @@ int rpmdepOrder(rpmTransactionSet ts) teIterator ri; transactionElement r; tsortInfo tsi; tsortInfo tsi_next; - int * ordering = alloca(sizeof(*ordering) * (numAddedPackages + 1)); + alKey * ordering = alloca(sizeof(*ordering) * (numAddedPackages + 1)); int orderingCount = 0; unsigned char * selected = alloca(sizeof(*selected) * (ts->orderCount + 1)); int loopcheck; @@ -1332,8 +1305,8 @@ fprintf(stderr, "*** rpmdepOrder(%p) order %p[%d]\n", ts, ts->order, ts->orderCo while ((p = teNext(pi, TR_ADDED)) != NULL) { /* Retrieve info from addedPackages. */ - p->NEVR = alGetNVR(ts->addedPackages, p->u.addedIndex); - p->name = alGetNVR(ts->addedPackages, p->u.addedIndex); + p->NEVR = alGetNVR(ts->addedPackages, p->u.addedKey); + p->name = alGetNVR(ts->addedPackages, p->u.addedKey); /*@-nullpass@*/ if ((p->release = strrchr(p->name, '-')) != NULL) *p->release++ = '\0'; @@ -1354,7 +1327,7 @@ prtTSI(p->NEVR, &p->tsi); rpmDepSet requires; int_32 Flags; - requires = alGetRequires(ts->addedPackages, p->u.addedIndex); + requires = alGetRequires(ts->addedPackages, p->u.addedKey); if (requires == NULL) continue; @@ -1466,7 +1439,7 @@ prtTSI(" p", &p->tsi); orderingCount, q->npreds, q->tsi.tsi_qcnt, q->depth, (2 * q->depth), "", (q->NEVR ? q->NEVR : "???")); - ordering[orderingCount] = q->u.addedIndex; + ordering[orderingCount] = q->u.addedKey; orderingCount++; qlen--; loopcheck--; @@ -1562,7 +1535,7 @@ prtTSI(" p", &p->tsi); } /* Find (and destroy if co-requisite) "q <- p" relation. */ - requires = alGetRequires(ts->addedPackages, p->u.addedIndex); + requires = alGetRequires(ts->addedPackages, p->u.addedKey); requires = dsiInit(requires); dp = zapRelation(q, p, requires, 1, &nzaps); @@ -1624,7 +1597,7 @@ prtTSI(" p", &p->tsi); p->name = _free(p->name); /* Prepare added package ordering permutation. */ - orderList[j].alIndex = p->u.addedIndex; + orderList[j].pkgKey = p->u.addedKey; orderList[j].orIndex = teGetOc(pi); j++; } @@ -1634,12 +1607,13 @@ prtTSI(" p", &p->tsi); qsort(orderList, numAddedPackages, sizeof(*orderList), orderListIndexCmp); newOrder = xcalloc(ts->orderCount, sizeof(*newOrder)); + /*@-branchstate@*/ for (i = 0, newOrderCount = 0; i < orderingCount; i++) { struct orderListIndex_s key; orderListIndex needle; - key.alIndex = ordering[i]; + key.pkgKey = ordering[i]; needle = bsearch(&key, orderList, numAddedPackages, sizeof(key), orderListIndexCmp); /* bsearch should never, ever fail */ @@ -1653,7 +1627,7 @@ prtTSI(" p", &p->tsi); for (j = needle->orIndex + 1; j < ts->orderCount; j++) { q = ts->order + j; if (q->type == TR_REMOVED && - q->u.removed.dependsOnIndex == needle->alIndex) { + q->u.removed.dependsOnKey == needle->pkgKey) { /*@-assignexpose@*/ newOrder[newOrderCount++] = *q; /* structure assignment */ /*@=assignexpose@*/ @@ -1661,12 +1635,13 @@ prtTSI(" p", &p->tsi); /*@innerbreak@*/ break; } } + /*@=branchstate@*/ /*@-compmempass -usereleased@*/ /* FIX: ts->order[].{NEVR,name} released */ pi = teInitIterator(ts); /*@=compmempass =usereleased@*/ while ((p = teNext(pi, TR_REMOVED)) != NULL) { - if (p->u.removed.dependsOnIndex == -1) { + if (p->u.removed.dependsOnKey == RPMAL_NOMATCH) { /*@-assignexpose@*/ newOrder[newOrderCount] = *p; /* structure assignment */ /*@=assignexpose@*/ @@ -1769,7 +1744,7 @@ int rpmdepCheck(rpmTransactionSet ts, /*@notreached@*/ /*@switchbreak@*/ break; } - h = alGetHeader(ts->addedPackages, p->u.addedIndex, 0); + h = alGetHeader(ts->addedPackages, p->u.addedKey, 0); if (h == NULL) /* XXX can't happen */ break; @@ -1799,7 +1774,7 @@ int rpmdepCheck(rpmTransactionSet ts, if (rc) goto exit; - provides = alGetProvides(ts->addedPackages, p->u.addedIndex); + provides = alGetProvides(ts->addedPackages, p->u.addedKey); rc = 0; provides = dsiInit(provides); diff --git a/lib/depends.h b/lib/depends.h index 751a16a..c4eebb0 100644 --- a/lib/depends.h +++ b/lib/depends.h @@ -88,10 +88,10 @@ struct transactionElement_s { /*@-fielduse@*/ /* LCL: confused by union? */ union { -/*@unused@*/ int addedIndex; +/*@unused@*/ alKey addedKey; /*@unused@*/ struct { + alKey dependsOnKey; int dboffset; - int dependsOnIndex; } removed; } u; /*@=fielduse@*/ diff --git a/lib/problems.c b/lib/problems.c index 75616b7..5588237 100644 --- a/lib/problems.c +++ b/lib/problems.c @@ -10,6 +10,7 @@ #include "misc.h" #include "debug.h" +/*@access alKey@*/ /*@access rpmProblem@*/ /*@access rpmProblemSet@*/ /*@access rpmDependencyConflict@*/ @@ -190,7 +191,9 @@ rpmDependencyConflict rpmdepFreeConflicts(rpmDependencyConflict conflicts, conflicts[i].byRelease = _free(conflicts[i].byRelease); conflicts[i].needsName = _free(conflicts[i].needsName); conflicts[i].needsVersion = _free(conflicts[i].needsVersion); - conflicts[i].suggestedPackages = _free(conflicts[i].suggestedPackages); + /*@-evalorder@*/ + conflicts[i].suggestedPkgs = _free(conflicts[i].suggestedPkgs); + /*@=evalorder@*/ } return (conflicts = _free(conflicts)); diff --git a/lib/psm.c b/lib/psm.c index 586b92a..c17ed7a 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -33,6 +33,8 @@ int _fi_debug = 0; /*@access rpmTransactionSet@*/ /*@access TFI_t@*/ /*@access PSM_t@*/ + +/*@access alKey@*/ /*@access rpmDepSet@*/ /*@-redecl -declundef -exportheadervar@*/ @@ -1176,6 +1178,7 @@ rpmRC rpmInstallSourcePackage(rpmTransactionSet ts, int isSource; rpmRC rc; int i; + alKey pkgKey = (alKey)0; /*@-mods -temptrans -assignexpose@*/ ts->notify = notify; @@ -1201,7 +1204,7 @@ rpmRC rpmInstallSourcePackage(rpmTransactionSet ts, fi->type = TR_ADDED; - fi->h = alGetHeader(ts->addedPackages, 0, 1); + fi->h = alGetHeader(ts->addedPackages, pkgKey, 1); /* XXX can't happen */ if (fi->h == NULL) { rc = RPMRC_FAIL; @@ -1210,10 +1213,10 @@ rpmRC rpmInstallSourcePackage(rpmTransactionSet ts, fi->multiLib = 0; /* MULTILIB for src.rpm's? */ /*@-kepttrans@*/ - fi->key = alGetKey(ts->addedPackages, 0); + fi->key = alGetKey(ts->addedPackages, pkgKey); /*@=kepttrans@*/ - fi->relocs = alGetRelocs(ts->addedPackages, 0); - fi->fd = alGetFd(ts->addedPackages, 0); + fi->relocs = alGetRelocs(ts->addedPackages, pkgKey); + fi->fd = alGetFd(ts->addedPackages, pkgKey); /* XXX header arg unused. */ loadFi(ts, fi, fi->h, 1); diff --git a/lib/rpmal.c b/lib/rpmal.c index dbfbabc..f9a49f9 100644 --- a/lib/rpmal.c +++ b/lib/rpmal.c @@ -29,58 +29,98 @@ typedef /*@abstract@*/ struct availableIndex_s * availableIndex; /*@access availablePackage@*/ /*@access tsortInfo@*/ +/*@access alKey@*/ +/*@access alNum@*/ /*@access rpmDepSet@*/ /** \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; +}; + +/** \ingroup rpmdep * A single available item (e.g. a Provides: dependency). */ struct availableIndexEntry_s { -/*@dependent@*/ availablePackage package; /*!< Containing package. */ -/*@dependent@*/ const char * entry; /*!< Available item name. */ - size_t entryLen; /*!< No. of bytes in name. */ +/*@dependent@*/ + availablePackage package; /*!< Containing package. */ +/*@dependent@*/ + const char * entry; /*!< Available item name. */ + size_t entryLen; /*!< No. of bytes in name. */ enum indexEntryType { - IET_PROVIDES=1 /*!< A Provides: dependency. */ - } type; /*!< Type of available item. */ + IET_PROVIDES=1 /*!< A Provides: dependency. */ + } type; /*!< Type of available item. */ }; /** \ingroup rpmdep * Index of all available items. */ struct availableIndex_s { -/*@null@*/ availableIndexEntry index; /*!< Array of available items. */ - int size; /*!< No. of available items. */ +/*@null@*/ + availableIndexEntry index; /*!< Array of available items. */ + int size; /*!< No. of available items. */ }; /** \ingroup rpmdep * A file to be installed/removed. */ struct fileIndexEntry_s { - int pkgNum; /*!< Containing package number. */ + alNum pkgNum; /*!< Containing package index. */ int fileFlags; /* MULTILIB */ -/*@dependent@*/ /*@null@*/ const char * baseName; /*!< File basename. */ +/*@dependent@*/ /*@null@*/ + const char * baseName; /*!< File basename. */ }; /** \ingroup rpmdep * A directory to be installed/removed. */ struct dirInfo_s { -/*@owned@*/ const char * dirName; /*!< Directory path (+ trailing '/'). */ - int dirNameLen; /*!< No. bytes in directory path. */ -/*@owned@*/ fileIndexEntry files; /*!< Array of files in directory. */ - int numFiles; /*!< No. files in directory. */ +/*@owned@*/ + const char * dirName; /*!< Directory path (+ trailing '/'). */ + int dirNameLen; /*!< No. bytes in directory path. */ +/*@owned@*/ + fileIndexEntry files; /*!< Array of files in directory. */ + int numFiles; /*!< No. files in directory. */ }; /** \ingroup rpmdep * Set of available packages, items, and directories. */ struct availableList_s { -/*@owned@*/ /*@null@*/ availablePackage list; /*!< Set of packages. */ +/*@owned@*/ /*@null@*/ + availablePackage list; /*!< Set of packages. */ struct availableIndex_s index; /*!< Set of available items. */ - int delta; /*!< Delta for pkg list reallocation. */ - int size; /*!< No. of pkgs in list. */ - int alloced; /*!< No. of pkgs allocated for list. */ - int numDirs; /*!< No. of directories. */ -/*@owned@*/ /*@null@*/ dirInfo dirs; /*!< Set of directories. */ + int delta; /*!< Delta for pkg list reallocation. */ + int size; /*!< No. of pkgs in list. */ + int alloced; /*!< No. of pkgs allocated for list. */ + int numDirs; /*!< No. of directories. */ +/*@owned@*/ /*@null@*/ + dirInfo dirs; /*!< Set of directories. */ }; /*@unchecked@*/ @@ -104,9 +144,30 @@ int alGetSize(const availableList al) return al->size; } -availablePackage alGetPkg(const availableList al, int pkgNum) +static inline alNum alKey2Num(/*@unused@*/ /*@null@*/ const availableList al, + /*@null@*/ alKey pkgKey) + /*@*/ +{ + /*@-nullret -temptrans -retalias @*/ + return ((alNum)pkgKey); + /*@=nullret =temptrans =retalias @*/ +} + +/*@unused@*/ +static inline alKey alNum2Key(/*@unused@*/ /*@null@*/ const availableList al, + /*@null@*/ alNum pkgNum) + /*@*/ +{ + /*@-nullret -temptrans -retalias @*/ + return ((alKey)pkgNum); + /*@=nullret =temptrans =retalias @*/ +} + +availablePackage alGetPkg(const availableList al, alKey pkgKey) { availablePackage alp = NULL; + alNum pkgNum = alKey2Num(al, pkgKey); + if (al != NULL && pkgNum >= 0 && pkgNum < al->size) { if (al->list != NULL) alp = al->list + pkgNum; @@ -118,47 +179,48 @@ fprintf(stderr, "*** alp[%d] %p\n", pkgNum, alp); return alp; } -const void * alGetKey(const availableList al, int pkgNum) +const void * alGetKey(const availableList al, alKey pkgKey) { - availablePackage alp = alGetPkg(al, pkgNum); + availablePackage alp = alGetPkg(al, pkgKey); + /*@-retexpose@*/ return (alp != NULL ? alp->key : NULL); /*@=retexpose@*/ } #ifdef DYING -int alGetMultiLib(const availableList al, int pkgNum) +int alGetMultiLib(const availableList al, alKey pkgKey) { - availablePackage alp = alGetPkg(al, pkgNum); + availablePackage alp = alGetPkg(al, alKey); return (alp != NULL ? alp->multiLib : 0); } #endif -int alGetFilesCount(const availableList al, int pkgNum) +int alGetFilesCount(const availableList al, alKey pkgKey) { - availablePackage alp = alGetPkg(al, pkgNum); + availablePackage alp = alGetPkg(al, pkgKey); return (alp != NULL ? alp->filesCount : 0); } -rpmDepSet alGetProvides(const availableList al, int pkgNum) +rpmDepSet alGetProvides(const availableList al, alKey pkgKey) { - availablePackage alp = alGetPkg(al, pkgNum); + availablePackage alp = alGetPkg(al, pkgKey); /*@-retexpose@*/ return (alp != NULL ? alp->provides : 0); /*@=retexpose@*/ } -rpmDepSet alGetRequires(const availableList al, int pkgNum) +rpmDepSet alGetRequires(const availableList al, alKey pkgKey) { - availablePackage alp = alGetPkg(al, pkgNum); + availablePackage alp = alGetPkg(al, pkgKey); /*@-retexpose@*/ return (alp != NULL ? alp->requires : 0); /*@=retexpose@*/ } -Header alGetHeader(availableList al, int pkgNum, int unlink) +Header alGetHeader(availableList al, alKey pkgKey, int unlink) { - availablePackage alp = alGetPkg(al, pkgNum); + availablePackage alp = alGetPkg(al, pkgKey); Header h = NULL; if (alp != NULL && alp->h != NULL) { @@ -171,9 +233,9 @@ Header alGetHeader(availableList al, int pkgNum, int unlink) return h; } -rpmRelocation * alGetRelocs(const availableList al, int pkgNum) +rpmRelocation * alGetRelocs(const availableList al, alKey pkgKey) { - availablePackage alp = alGetPkg(al, pkgNum); + availablePackage alp = alGetPkg(al, pkgKey); rpmRelocation * relocs = NULL; if (alp != NULL) { @@ -183,9 +245,9 @@ rpmRelocation * alGetRelocs(const availableList al, int pkgNum) return relocs; } -FD_t alGetFd(availableList al, int pkgNum) +FD_t alGetFd(availableList al, alKey pkgKey) { - availablePackage alp = alGetPkg(al, pkgNum); + availablePackage alp = alGetPkg(al, pkgKey); FD_t fd = NULL; if (alp != NULL) { @@ -199,24 +261,26 @@ FD_t alGetFd(availableList al, int pkgNum) /*@=refcounttrans@*/ } -int alGetPkgIndex(const availableList al, const availablePackage alp) +#ifdef DYING +alNum alGetPkgIndex(const availableList al, const availablePackage alp) { - int pkgNum = -1; + 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 = alp - al->list; + pkgNum = ((alNum)(alp - al->list)); } /*@-modfilesys@*/ if (_al_debug) -fprintf(stderr, "*** alp %p[%d]\n", alp, pkgNum); +fprintf(stderr, "*** alp %p[%d]\n", alp, (int)pkgNum); /*@=modfilesys@*/ return pkgNum; } +#endif /* DYING */ -char * alGetNVR(const availableList al, int pkgNum) +char * alGetNVR(const availableList al, alKey pkgKey) { - availablePackage alp = alGetPkg(al, pkgNum); + availablePackage alp = alGetPkg(al, pkgKey); char * pkgNVR = NULL; if (alp != NULL) { @@ -329,37 +393,38 @@ static int dirInfoCompare(const void * one, const void * two) /*@*/ return strcmp(a->dirName, b->dirName); } -void alDelPackage(availableList al, int pkgNum) +void alDelPackage(availableList al, alKey pkgKey) { HGE_t hge = (HGE_t)headerGetEntryMinMemory; HFD_t hfd = headerFreeData; - availablePackage p; + availablePackage alp; + alNum pkgNum = alKey2Num(al, pkgKey); /*@-nullptrarith@*/ /* FIX: al->list might be NULL */ - p = al->list + pkgNum; + alp = al->list + pkgNum; /*@=nullptrarith@*/ /*@-modfilesys@*/ if (_al_debug) -fprintf(stderr, "*** del %p[%d] %s-%s-%s\n", al->list, pkgNum, p->name, p->version, p->release); +fprintf(stderr, "*** del %p[%d] %s-%s-%s\n", al->list, pkgNum, alp->name, alp->version, alp->release); /*@=modfilesys@*/ - if (p->relocs) { + if (alp->relocs) { rpmRelocation * r; - for (r = p->relocs; r->oldPath || r->newPath; r++) { + for (r = alp->relocs; r->oldPath || r->newPath; r++) { r->oldPath = _free(r->oldPath); r->newPath = _free(r->newPath); } - p->relocs = _free(p->relocs); + alp->relocs = _free(alp->relocs); } - if (p->fd) { + if (alp->fd) { /*@-type@*/ /* FIX: cast? */ - (void) fdFree(p->fd, "alDelPackage"); + (void) fdFree(alp->fd, "alDelPackage"); /*@=type@*/ - p->fd = NULL; + alp->fd = NULL; } - if (p->baseNames != NULL && p->filesCount > 0) { + if (alp->baseNames != NULL && alp->filesCount > 0) { int origNumDirs = al->numDirs; const char ** dirNames; int_32 numDirs; @@ -371,7 +436,7 @@ fprintf(stderr, "*** del %p[%d] %s-%s-%s\n", al->list, pkgNum, p->name, p->versi int last; int i, xx; - xx = hge(p->h, RPMTAG_DIRNAMES, &dnt, (void **) &dirNames, &numDirs); + xx = hge(alp->h, RPMTAG_DIRNAMES, &dnt, (void **) &dirNames, &numDirs); /* XXX FIXME: We ought to relocate the directory list here */ @@ -416,15 +481,14 @@ fprintf(stderr, "*** del %p[%d] %s-%s-%s\n", al->list, pkgNum, p->name, p->versi dirNames = hfd(dirNames, dnt); } - p->h = headerFree(p->h, "alDelPackage"); - memset(p, 0, sizeof(*p)); + alp->h = headerFree(alp->h, "alDelPackage"); + memset(alp, 0, sizeof(*alp)); /* XXX trash and burn */ /*@-nullstate@*/ /* FIX: al->list->h may be NULL */ return; /*@=nullstate@*/ } -long -alAddPackage(availableList al, int pkgNum, +alKey alAddPackage(availableList al, alKey pkgKey, Header h, /*@null@*/ /*@dependent@*/ const void * key, /*@null@*/ FD_t fd, /*@null@*/ rpmRelocation * relocs) /*@modifies al, h @*/ @@ -433,7 +497,8 @@ alAddPackage(availableList al, int pkgNum, HGE_t hge = (HGE_t)headerGetEntryMinMemory; HFD_t hfd = headerFreeData; rpmTagType dnt, bnt; - availablePackage p; + availablePackage alp; + alNum pkgNum = alKey2Num(al, pkgKey); int i, xx; #ifdef DYING uint_32 multiLibMask = 0; @@ -441,7 +506,7 @@ alAddPackage(availableList al, int pkgNum, #endif if (pkgNum >= 0 && pkgNum < al->size) { - alDelPackage(al, pkgNum); + alDelPackage(al, pkgKey); } else { if (al->size == al->alloced) { al->alloced += al->delta; @@ -450,18 +515,20 @@ alAddPackage(availableList al, int pkgNum, pkgNum = al->size++; } - p = al->list + pkgNum; + /*@-nullptrarith@*/ + alp = al->list + pkgNum; + /*@=nullptrarith@*/ - p->h = headerLink(h, "alAddPackage"); + alp->h = headerLink(h, "alAddPackage"); #ifdef DYING - p->multiLib = 0; /* MULTILIB */ + alp->multiLib = 0; /* MULTILIB */ #endif - xx = headerNVR(p->h, &p->name, &p->version, &p->release); + xx = headerNVR(alp->h, &alp->name, &alp->version, &alp->release); /*@-modfilesys@*/ if (_al_debug) -fprintf(stderr, "*** add %p[%d] %s-%s-%s\n", al->list, pkgNum, p->name, p->version, p->release); +fprintf(stderr, "*** add %p[%d] %s-%s-%s\n", al->list, pkgNum, alp->name, alp->version, alp->release); /*@=modfilesys@*/ #ifdef DYING @@ -470,32 +537,32 @@ fprintf(stderr, "*** add %p[%d] %s-%s-%s\n", al->list, pkgNum, p->name, p->versi * XXX However, there is logic in files.c/depends.c that checks for * XXX existence (rather than value) that will need to change as well. */ - if (hge(p->h, RPMTAG_MULTILIBS, NULL, (void **) &pp, NULL)) + if (hge(alp->h, RPMTAG_MULTILIBS, NULL, (void **) &pp, NULL)) multiLibMask = *pp; if (multiLibMask) { for (i = 0; i < pkgNum - 1; i++) { - if (!strcmp (p->name, al->list[i].name) + if (!strcmp (alp->name, al->list[i].name) && hge(al->list[i].h, RPMTAG_MULTILIBS, NULL, (void **) &pp, NULL) - && !rpmVersionCompare(p->h, al->list[i].h) + && !rpmVersionCompare(alp->h, al->list[i].h) && *pp && !(*pp & multiLibMask)) - p->multiLib = multiLibMask; + alp->multiLib = multiLibMask; } } } #endif - if (!hge(h, RPMTAG_EPOCH, NULL, (void **) &p->epoch, NULL)) - p->epoch = NULL; + if (!hge(h, RPMTAG_EPOCH, NULL, (void **) &alp->epoch, NULL)) + alp->epoch = NULL; - p->provides = dsNew(h, RPMTAG_PROVIDENAME, scareMem); - p->requires = dsNew(h, RPMTAG_REQUIRENAME, scareMem); + alp->provides = dsNew(h, RPMTAG_PROVIDENAME, scareMem); + alp->requires = dsNew(h, RPMTAG_REQUIRENAME, scareMem); - if (!hge(h, RPMTAG_BASENAMES, &bnt, (void **)&p->baseNames, &p->filesCount)) + if (!hge(h, RPMTAG_BASENAMES, &bnt, (void **)&alp->baseNames, &alp->filesCount)) { - p->filesCount = 0; - p->baseNames = NULL; + alp->filesCount = 0; + alp->baseNames = NULL; } else { int_32 * dirIndexes; const char ** dirNames; @@ -542,8 +609,8 @@ fprintf(stderr, "*** add %p[%d] %s-%s-%s\n", al->list, pkgNum, p->name, p->versi dirNames = hfd(dirNames, dnt); - for (first = 0; first < p->filesCount; first = last + 1) { - for (last = first; (last + 1) < p->filesCount; last++) { + for (first = 0; first < alp->filesCount; first = last + 1) { + for (last = first; (last + 1) < alp->filesCount; last++) { if (dirIndexes[first] != dirIndexes[last + 1]) /*@innerbreak@*/ break; } @@ -552,11 +619,11 @@ fprintf(stderr, "*** add %p[%d] %s-%s-%s\n", al->list, pkgNum, p->name, p->versi dirMatch->files = xrealloc(dirMatch->files, (dirMatch->numFiles + last - first + 1) * sizeof(*dirMatch->files)); - if (p->baseNames != NULL) /* XXX can't happen */ + if (alp->baseNames != NULL) /* XXX can't happen */ for (fileNum = first; fileNum <= last; fileNum++) { /*@-assignexpose@*/ dirMatch->files[dirMatch->numFiles].baseName = - p->baseNames[fileNum]; + alp->baseNames[fileNum]; /*@=assignexpose@*/ dirMatch->files[dirMatch->numFiles].pkgNum = pkgNum; dirMatch->files[dirMatch->numFiles].fileFlags = @@ -572,10 +639,10 @@ fprintf(stderr, "*** add %p[%d] %s-%s-%s\n", al->list, pkgNum, p->name, p->versi } /*@-assignexpose@*/ - p->key = key; + alp->key = key; /*@=assignexpose@*/ /*@-type@*/ /* FIX: cast? */ - p->fd = (fd != NULL ? fdLink(fd, "alAddPackage") : NULL); + alp->fd = (fd != NULL ? fdLink(fd, "alAddPackage") : NULL); /*@=type@*/ if (relocs) { @@ -583,22 +650,24 @@ fprintf(stderr, "*** add %p[%d] %s-%s-%s\n", al->list, pkgNum, p->name, p->versi for (i = 0, r = relocs; r->oldPath || r->newPath; i++, r++) {}; - p->relocs = xmalloc((i + 1) * sizeof(*p->relocs)); + alp->relocs = xmalloc((i + 1) * sizeof(*alp->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; + alp->relocs[i].oldPath = r->oldPath ? xstrdup(r->oldPath) : NULL; + alp->relocs[i].newPath = r->newPath ? xstrdup(r->newPath) : NULL; } - p->relocs[i].oldPath = NULL; - p->relocs[i].newPath = NULL; + alp->relocs[i].oldPath = NULL; + alp->relocs[i].newPath = NULL; } else { - p->relocs = NULL; + alp->relocs = NULL; } + /*@-compdef@*/ /* FIX: al->list->relocs-?{oldPath,newPath} undefined */ alFreeIndex(al); + /*@=compdef@*/ -assert((p - al->list) == pkgNum); - return (p - al->list); +assert(((alNum)(alp - al->list)) == pkgNum); + return ((alKey)(alp - al->list)); } /** @@ -663,9 +732,7 @@ void alMakeIndex(availableList al) } } -availablePackage * -alAllFileSatisfiesDepend(const availableList al, const char * keyType, - const char * fileName) +alKey * alAllFileSatisfiesDepend(const availableList al, const rpmDepSet ds) { int i, found = 0; const char * dirName; @@ -673,7 +740,11 @@ alAllFileSatisfiesDepend(const availableList al, const char * keyType, dirInfo dirNeedle = memset(alloca(sizeof(*dirNeedle)), 0, sizeof(*dirNeedle)); dirInfo dirMatch; - availablePackage * ret = NULL; + alKey * ret = NULL; + const char * fileName; + + if ((fileName = dsiGetN(ds)) == NULL || *fileName != '/') + return NULL; /* Solaris 2.6 bsearch sucks down on this. */ if (al->numDirs == 0 || al->dirs == NULL || al->list == NULL) @@ -723,10 +794,14 @@ alAllFileSatisfiesDepend(const availableList al, const char * keyType, /*@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 */ @@ -748,38 +823,40 @@ exit: /** * Check added package file lists for first package that provides a file. * @param al available list - * @param keyType type of dependency - * @param fileName file name to search for + * @param ds dependency * @return available package pointer */ -/*@unused@*/ static /*@dependent@*/ /*@null@*/ availablePackage -alFileSatisfiesDepend(const availableList al, const char * keyType, - const char * fileName) +/*@unused@*/ static /*@dependent@*/ /*@null@*/ alKey +alFileSatisfiesDepend(const availableList al, const rpmDepSet ds) /*@*/ { - availablePackage ret; - availablePackage * tmp = alAllFileSatisfiesDepend(al, keyType, fileName); + alKey ret = NULL; + alKey * tmp = alAllFileSatisfiesDepend(al, ds); if (tmp) { ret = tmp[0]; tmp = _free(tmp); - return ret; } - return NULL; + return ret; } #endif /* DYING */ -availablePackage * -alAllSatisfiesDepend(const availableList al, const rpmDepSet key) +alKey * +alAllSatisfiesDepend(const availableList al, const rpmDepSet ds) { availableIndexEntry needle = memset(alloca(sizeof(*needle)), 0, sizeof(*needle)); availableIndexEntry match; - availablePackage p, * ret = NULL; + alKey * ret = NULL; + const char * KName; + availablePackage alp; int rc, found; - if (*key->N[key->i] == '/') { - ret = alAllFileSatisfiesDepend(al, key->Type, key->N[key->i]); + if ((KName = dsiGetN(ds)) == NULL) + return ret; + + if (*KName == '/') { + ret = alAllFileSatisfiesDepend(al, ds); /* XXX Provides: /path was broken with added packages (#52183). */ if (ret != NULL && *ret != NULL) return ret; @@ -789,9 +866,9 @@ alAllSatisfiesDepend(const availableList al, const rpmDepSet key) /*@-assignexpose@*/ /*@-temptrans@*/ - needle->entry = key->N[key->i]; + needle->entry = KName; /*@=temptrans@*/ - needle->entryLen = strlen(key->N[key->i]); + needle->entryLen = strlen(KName); match = bsearch(needle, al->index.index, al->index.size, sizeof(*al->index.index), indexcmp); /*@=assignexpose@*/ @@ -807,23 +884,27 @@ alAllSatisfiesDepend(const availableList al, const rpmDepSet key) indexcmp(match, needle) == 0; match++) { - p = match->package; + alp = match->package; rc = 0; switch (match->type) { case IET_PROVIDES: - if (p->provides != NULL) - for (dsiInit(p->provides) != NULL; dsiNext(p->provides) >= 0;) { + if (alp->provides != NULL) + for (dsiInit(alp->provides) != NULL; dsiNext(alp->provides) >= 0;) { + const char * PName; + + if ((PName = dsiGetN(alp->provides)) == NULL) + /*@innercontinue@*/ continue; /* Filter out provides that came along for the ride. */ - if (strcmp(p->provides->N[p->provides->i], key->N[key->i])) + if (strcmp(PName, KName)) /*@innercontinue@*/ continue; - rc = dsCompare(p->provides, key); + rc = dsCompare(alp->provides, ds); if (rc) /*@innerbreak@*/ break; } - if (key->Type && rc) - dsiNotify(key, _("(added provide)"), 0); + if (rc) + dsiNotify(ds, _("(added provide)"), 0); /*@switchbreak@*/ break; } @@ -831,7 +912,7 @@ alAllSatisfiesDepend(const availableList al, const rpmDepSet key) if (rc) { ret = xrealloc(ret, (found + 2) * sizeof(*ret)); if (ret) /* can't happen */ - ret[found++] = p; + ret[found++] = ((alKey)(alp - al->list)); } /*@=branchstate@*/ } @@ -842,14 +923,14 @@ alAllSatisfiesDepend(const availableList al, const rpmDepSet key) return ret; } -long alSatisfiesDepend(const availableList al, const rpmDepSet key) +alKey alSatisfiesDepend(const availableList al, const rpmDepSet ds) { - availablePackage * tmp = alAllSatisfiesDepend(al, key); + alKey * tmp = alAllSatisfiesDepend(al, ds); if (tmp) { - availablePackage ret = tmp[0]; + alKey ret = tmp[0]; tmp = _free(tmp); - return (ret - al->list); + return ret; } - return -1; + return RPMAL_NOMATCH; } diff --git a/lib/rpmal.h b/lib/rpmal.h index 6ebcd34..2717df7 100644 --- a/lib/rpmal.h +++ b/lib/rpmal.h @@ -6,6 +6,12 @@ * Structures used for managing added/available package lists. */ +/** + * A package from an availableList. + */ +typedef /*@abstract@*/ struct availablePackage_s * availablePackage; + +#ifdef DYING /** \ingroup rpmdep * Info about a single package to be installed. */ @@ -35,6 +41,7 @@ struct availablePackage_s { /*@null@*/ rpmRelocation * relocs; /*@null@*/ FD_t fd; }; +#endif #ifdef __cplusplus extern "C" { @@ -49,116 +56,119 @@ int alGetSize(const availableList al) /*@*/; /** - * Return available package key. + * Return available package identifier key. * @param al available list - * @param pkgNum available package index - * @return available package key + * @param pkgKey available package key + * @return available identifier key */ /*@kept@*/ /*@null@*/ -const void * alGetKey(/*@null@*/ const availableList al, int pkgNum) +const void * alGetKey(/*@null@*/ const availableList al, /*@null@*/alKey pkgKey) /*@*/; #ifdef DYING /** * Return available package multiLib flag. * @param al available list - * @param pkgNum available package index + * @param pkgKey available package key * @return available package multiLib flag */ -int alGetMultiLib(/*@null@*/ const availableList al, int pkgNum) +int alGetMultiLib(/*@null@*/ const availableList al, /*@null@*/ alKey pkgKey) /*@*/; #endif /** * Return available package files count. * @param al available list - * @param pkgNum available package index + * @param pkgKey available package key * @return available package files count */ -int alGetFilesCount(/*@null@*/ const availableList al, int pkgNum) +int alGetFilesCount(/*@null@*/ const availableList al, /*@null@*/ alKey pkgKey) /*@*/; /** * Return available package provides. * @param al available list - * @param pkgNum available package index + * @param pkgKey available package key * @return available package provides */ /*@null@*/ -rpmDepSet alGetProvides(/*@null@*/ const availableList al, int pkgNum) +rpmDepSet alGetProvides(/*@null@*/ const availableList al, /*@null@*/ alKey pkgKey) /*@*/; /** * Return available package requires. * @param al available list - * @param pkgNum available package index + * @param pkgKey available package key * @return available package requires */ /*@null@*/ -rpmDepSet alGetRequires(/*@null@*/ const availableList al, int pkgNum) +rpmDepSet alGetRequires(/*@null@*/ const availableList al, /*@null@*/ alKey pkgKey) /*@*/; /** * Return available package header. * @param al available list - * @param pkgNum available package index + * @param pkgKey available package key * @param unlink Should alp->h be unlinked? * @return available package header */ -Header alGetHeader(/*@null@*/ availableList al, int pkgNum, int unlink) +Header alGetHeader(/*@null@*/ availableList al, /*@null@*/ alKey pkgKey, + int unlink) /*@modifies al @*/; /** * Return available package relocations. * @warning alp->relocs set to NULL after call. * @param al available list - * @param pkgNum available package index + * @param pkgKey available package key * @return available package relocations */ /*@null@*/ -rpmRelocation * alGetRelocs(/*@null@*/ availableList al, int pkgNum) +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 pkgNum available package index + * @param pkgKey available package key * @return available package file handle */ /*@null@*/ -FD_t alGetFd(/*@null@*/ availableList al, int pkgNum) +FD_t alGetFd(/*@null@*/ availableList al, /*@null@*/ alKey pkgKey) /*@modifies al @*/; /** * Return available package. * @param al available list - * @param pkgNum available package index + * @param pkgKey available package key * @return available package pointer */ /*@-exportlocal@*/ /*@dependent@*/ /*@null@*/ -availablePackage alGetPkg(/*@null@*/ availableList al, int pkgNum) +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 */ -int alGetPkgIndex(/*@null@*/ const availableList al, const availablePackage alp) +alNum alGetPkgIndex(/*@null@*/ const availableList al, const availablePackage alp) /*@*/; +#endif /** * Return (malloc'd) available package name-version-release string. * @param al available list - * @param pkgNum available package index + * @param pkgKey available package key * @return name-version-release string */ /*@only@*/ /*@null@*/ -char * alGetNVR(/*@null@*/const availableList al, int pkgNum) +char * alGetNVR(/*@null@*/const availableList al, /*@null@*/ alKey pkgKey) /*@*/; #ifdef DYING @@ -195,24 +205,24 @@ availableList alFree(/*@only@*/ /*@null@*/ availableList al) /** * Delete package from available list. * @param al available list - * @param pkgNnum package index + * @param pkgKey package key */ /*@-exportlocal@*/ -void alDelPackage(availableList al, int pkgNum) +void alDelPackage(availableList al, /*@null@*/ alKey pkgKey) /*@modifies al @*/; /*@=exportlocal@*/ /** * Add package to available list. * @param al available list - * @param pkgNnum package index, < 0 to force an append + * @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 */ -long alAddPackage(availableList al, int pkgNum, +alKey alAddPackage(availableList al, /*@null@*/ alKey pkgKey, Header h, /*@null@*/ /*@dependent@*/ const void * key, /*@null@*/ FD_t fd, /*@null@*/ rpmRelocation * relocs) /*@modifies al, h @*/; @@ -227,26 +237,24 @@ void alMakeIndex(availableList al) /** * Check added package file lists for package(s) that provide a file. * @param al available list - * @param keyType type of dependency - * @param fileName file name to search for + * @param ds dependency set * @return available package pointer */ /*@-exportlocal@*/ /*@only@*/ /*@null@*/ -availablePackage * alAllFileSatisfiesDepend(const availableList al, - const char * keyType, const char * fileName) - /*@*/; +alKey * alAllFileSatisfiesDepend(const availableList al, const rpmDepSet ds) + /*@globals fileSystem @*/ + /*@modifies fileSystem @*/; /*@=exportlocal@*/ /** * Check added package file lists for package(s) that have a provide. * @param al available list - * @param key dependency - * @return available package pointer + * @param ds dependency set + * @return available package keys */ /*@only@*/ /*@null@*/ -availablePackage * alAllSatisfiesDepend(const availableList al, - const rpmDepSet key) +alKey * alAllSatisfiesDepend(const availableList al, const rpmDepSet ds) /*@globals fileSystem @*/ /*@modifies fileSystem @*/; @@ -254,10 +262,10 @@ availablePackage * alAllSatisfiesDepend(const availableList al, * Check added package file lists for first package that has a provide. * @todo Eliminate. * @param al available list - * @param key dependency + * @param ds dependency set * @return available package index, -1 on not found */ -long alSatisfiesDepend(const availableList al, const rpmDepSet key) +alKey alSatisfiesDepend(const availableList al, const rpmDepSet ds) /*@globals fileSystem @*/ /*@modifies fileSystem @*/; diff --git a/lib/rpmds.c b/lib/rpmds.c index 612d5b5..f6da052 100644 --- a/lib/rpmds.c +++ b/lib/rpmds.c @@ -11,6 +11,7 @@ /*@access rpmDependencyConflict @*/ /*@access problemsSet @*/ +/*@access alKey@*/ /*@access rpmDepSet @*/ /*@unchecked@*/ @@ -134,41 +135,41 @@ fprintf(stderr, "*** ds %p ++ %s[%d]\n", ds, ds->Type, ds->Count); /*@=nullret@*/ } -char * dsDNEVR(const char * depend, const rpmDepSet key) +char * dsDNEVR(const char * dspfx, const rpmDepSet ds) { char * tbuf, * t; size_t nb; nb = 0; - if (depend) nb += strlen(depend) + 1; - if (key->N[key->i]) nb += strlen(key->N[key->i]); - if (key->Flags[key->i] & RPMSENSE_SENSEMASK) { + if (dspfx) nb += strlen(dspfx) + 1; + if (ds->N[ds->i]) nb += strlen(ds->N[ds->i]); + if (ds->Flags[ds->i] & RPMSENSE_SENSEMASK) { if (nb) nb++; - if (key->Flags[key->i] & RPMSENSE_LESS) nb++; - if (key->Flags[key->i] & RPMSENSE_GREATER) nb++; - if (key->Flags[key->i] & RPMSENSE_EQUAL) nb++; + if (ds->Flags[ds->i] & RPMSENSE_LESS) nb++; + if (ds->Flags[ds->i] & RPMSENSE_GREATER) nb++; + if (ds->Flags[ds->i] & RPMSENSE_EQUAL) nb++; } - if (key->EVR[key->i] && *key->EVR[key->i]) { + if (ds->EVR[ds->i] && *ds->EVR[ds->i]) { if (nb) nb++; - nb += strlen(key->EVR[key->i]); + nb += strlen(ds->EVR[ds->i]); } t = tbuf = xmalloc(nb + 1); - if (depend) { - t = stpcpy(t, depend); + if (dspfx) { + t = stpcpy(t, dspfx); *t++ = ' '; } - if (key->N[key->i]) - t = stpcpy(t, key->N[key->i]); - if (key->Flags[key->i] & RPMSENSE_SENSEMASK) { + if (ds->N[ds->i]) + t = stpcpy(t, ds->N[ds->i]); + if (ds->Flags[ds->i] & RPMSENSE_SENSEMASK) { if (t != tbuf) *t++ = ' '; - if (key->Flags[key->i] & RPMSENSE_LESS) *t++ = '<'; - if (key->Flags[key->i] & RPMSENSE_GREATER) *t++ = '>'; - if (key->Flags[key->i] & RPMSENSE_EQUAL) *t++ = '='; + if (ds->Flags[ds->i] & RPMSENSE_LESS) *t++ = '<'; + if (ds->Flags[ds->i] & RPMSENSE_GREATER) *t++ = '>'; + if (ds->Flags[ds->i] & RPMSENSE_EQUAL) *t++ = '='; } - if (key->EVR[key->i] && *key->EVR[key->i]) { + if (ds->EVR[ds->i] && *ds->EVR[ds->i]) { if (t != tbuf) *t++ = ' '; - t = stpcpy(t, key->EVR[key->i]); + t = stpcpy(t, ds->EVR[ds->i]); } *t = '\0'; return tbuf; @@ -250,10 +251,10 @@ int dsiNext(/*@null@*/ rpmDepSet ds) } } -/*@-modfilesystem@*/ +/*@-modfilesystem -nullderef -nullpass @*/ if (_ds_debug && i != -1) fprintf(stderr, "*** ds %p[%d] %s: %s\n", ds, i, (ds && ds->Type ? ds->Type : "?Type?"), (ds->DNEVR ? ds->DNEVR : "?DNEVR?")); -/*@=modfilesystem@*/ +/*@=modfilesystem =nullderef =nullpass @*/ return i; } @@ -387,14 +388,14 @@ exit: return result; } -void dsProblem(problemsSet psp, Header h, const rpmDepSet dep, - const void ** suggestedPackages) +void dsProblem(problemsSet psp, Header h, const rpmDepSet ds, + const alKey * suggestedPkgs) { rpmDependencyConflict dcp; - const char * Name = dsiGetN(dep); - const char * DNEVR = dsiGetDNEVR(dep); - const char * EVR = dsiGetEVR(dep); - int_32 Flags = dsiGetFlags(dep); + const char * Name = dsiGetN(ds); + const char * DNEVR = dsiGetDNEVR(ds); + const char * EVR = dsiGetEVR(ds); + int_32 Flags = dsiGetFlags(ds); const char * name, * version, * release; int xx; @@ -408,7 +409,7 @@ void dsProblem(problemsSet psp, Header h, const rpmDepSet dep, rpmMessage(RPMMESS_DEBUG, _("package %s-%s-%s has unsatisfied %s: %s\n"), name, version, release, - dep->Type, + ds->Type, DNEVR+2); if (psp->num == psp->alloced) { @@ -428,14 +429,14 @@ void dsProblem(problemsSet psp, Header h, const rpmDepSet dep, dcp->needsVersion = xstrdup(EVR); dcp->needsFlags = Flags; - if (dep->tagN == RPMTAG_REQUIRENAME) + if (ds->tagN == RPMTAG_REQUIRENAME) dcp->sense = RPMDEP_SENSE_REQUIRES; - else if (dep->tagN == RPMTAG_CONFLICTNAME) + else if (ds->tagN == RPMTAG_CONFLICTNAME) dcp->sense = RPMDEP_SENSE_CONFLICTS; else dcp->sense = 0; - dcp->suggestedPackages = suggestedPackages; + dcp->suggestedPkgs = suggestedPkgs; } int rangeMatchesDepFlags (Header h, const rpmDepSet req) diff --git a/lib/rpmds.h b/lib/rpmds.h index bd3baab..24f3ef2 100644 --- a/lib/rpmds.h +++ b/lib/rpmds.h @@ -68,12 +68,12 @@ rpmDepSet dsNew(Header h, rpmTag tagN, int scareMem) /** * Return new formatted dependency string. - * @param depend type of dependency ("R" == Requires, "C" == Conflcts) - * @param key dependency + * @param dspfx formatted dependency string prefix + * @param ds dependency set * @return new formatted dependency (malloc'ed) */ /*@only@*/ -char * dsDNEVR(const char * depend, const rpmDepSet key) +char * dsDNEVR(const char * dspfx, const rpmDepSet ds) /*@*/; /** @@ -152,8 +152,8 @@ int dsCompare(const rpmDepSet A, const rpmDepSet B) /** * Report a Requires: or Conflicts: dependency problem. */ -void dsProblem(problemsSet psp, Header h, const rpmDepSet dep, - /*@only@*/ /*@null@*/ const void ** suggestedPackages) +void dsProblem(problemsSet psp, Header h, const rpmDepSet ds, + /*@only@*/ /*@null@*/ const alKey * suggestedPkgs) /*@modifies psp, h @*/; /** diff --git a/lib/rpmlib.h b/lib/rpmlib.h index 451a6ae..ffc2a44 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -68,10 +68,26 @@ _free(/*@only@*/ /*@null@*/ /*@out@*/ const void * p) typedef /*@abstract@*/ /*@refcounted@*/ struct rpmTransactionSet_s * rpmTransactionSet; +#ifdef DYING /** \ingroup rpmtrans * A package in a transaction set. */ typedef /*@abstract@*/ struct availablePackage_s * availablePackage; +#else +/** \ingroup rpmtrans + * An added/available package retrieval key. + */ +typedef /*@abstract@*/ void * alKey; +#define RPMAL_NOMATCH ((alKey)-1L) + +/** \ingroup rpmtrans + * An added/available package retrieval index. + */ +/*@-mutrep@*/ +typedef /*@abstract@*/ int alNum; +/*@=mutrep@*/ + +#endif typedef /*@abstract@*/ struct rpmDepSet_s * rpmDepSet; @@ -1002,7 +1018,8 @@ struct rpmDependencyConflict_s { const char * needsName; /*!< dependency name */ const char * needsVersion; /*!< dependency epoch:version-release */ int needsFlags; /*!< dependency flags */ -/*@owned@*/ /*@null@*/ const void ** suggestedPackages; /* terminated by NULL */ +/*@owned@*/ /*@null@*/ + const alKey * suggestedPkgs; /* terminated by NULL */ enum { RPMDEP_SENSE_REQUIRES, /*!< requirement not satisfied. */ RPMDEP_SENSE_CONFLICTS /*!< conflict was found. */ diff --git a/lib/transaction.c b/lib/transaction.c index 0b4f35e..4b881ba 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -57,6 +57,8 @@ extern int statvfs (const char * file, /*@out@*/ struct statvfs * buf) /*@access PSM_t@*/ +/*@access alKey@*/ + /*@access TFI_t@*/ /*@access teIterator@*/ /*@access transactionElement@*/ @@ -121,7 +123,7 @@ 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: - *e = alGetKey(ts->addedPackages, ts->order[oc].u.addedIndex); + *e = alGetKey(ts->addedPackages, ts->order[oc].u.addedKey); /*@switchbreak@*/ break; default: case TR_REMOVED: @@ -923,7 +925,7 @@ int rpmRunTransactions( rpmTransactionSet ts, struct sharedFileInfo * shared, * sharedList; int numShared; int nexti; - int lastFailed; + alKey pkgKey, lastKey; int oc; fingerPrintCache fpc; struct psm_s psmbuf; @@ -1031,12 +1033,15 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ rpmdbMatchIterator mi; Header h; - h = alGetHeader(ts->addedPackages, i, 0); + /* XXX cast assumes that available keys are indices, not pointers */ + pkgKey = (alKey)i; + + h = alGetHeader(ts->addedPackages, pkgKey, 0); if (h == NULL) /* XXX can't happen */ continue; (void) headerNVR(h, &n, &v, &r); - key = alGetKey(ts->addedPackages, i); + key = alGetKey(ts->addedPackages, pkgKey); if (!archOkay(h) && !(ts->ignoreSet & RPMPROB_FILTER_IGNOREARCH)) rpmProblemSetAppend(ts->probs, RPMPROB_BADARCH, @@ -1075,7 +1080,7 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ mi = rpmdbFreeIterator(mi); } - totalFileCount += alGetFilesCount(ts->addedPackages, i); + totalFileCount += alGetFilesCount(ts->addedPackages, pkgKey); h = headerFree(h, "alGetHeader (rpmtsRun sanity)"); @@ -1110,6 +1115,7 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ */ tei = teInitIterator(ts); while ((fi = teNextFi(tei)) != NULL) { + oc = teGetOc(tei); fi->magic = TFIMAGIC; @@ -1120,19 +1126,19 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ case TR_ADDED: fi->record = 0; - i = ts->order[oc].u.addedIndex; + pkgKey = ts->order[oc].u.addedKey; - fi->h = alGetHeader(ts->addedPackages, i, 1); + fi->h = alGetHeader(ts->addedPackages, pkgKey, 1); #ifdef DYING /* XXX MULTILIB multiLib from transactionElement */ fi->multiLib = alGetMultiLib(ts->addedPackages, i); #else fi->multiLib = ts->order[oc].multiLib; #endif /*@-kepttrans@*/ - fi->key = alGetKey(ts->addedPackages, i); + fi->key = alGetKey(ts->addedPackages, pkgKey); /*@=kepttrans@*/ - fi->relocs = alGetRelocs(ts->addedPackages, i); - fi->fd = alGetFd(ts->addedPackages, i); + fi->relocs = alGetRelocs(ts->addedPackages, pkgKey); + fi->fd = alGetFd(ts->addedPackages, pkgKey); /* XXX availablePackage can be dumped here XXX */ @@ -1421,7 +1427,7 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ * Install and remove packages. */ - lastFailed = -2; /* erased packages have -1 */ + lastKey = (alKey)-2; /* erased packages have -1 */ tei = teInitIterator(ts); /*@-branchstate@*/ /* FIX: fi reload needs work */ while ((fi = teNextFi(tei)) != NULL) { @@ -1434,7 +1440,7 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ switch (fi->type) { case TR_ADDED: - i = ts->order[oc].u.addedIndex; + pkgKey = ts->order[oc].u.addedKey; rpmMessage(RPMMESS_DEBUG, "========== +++ %s-%s-%s\n", fi->name, fi->version, fi->release); @@ -1517,7 +1523,7 @@ fi->relocs = relocs; if (psmStage(psm, PSM_PKGINSTALL)) { ourrc++; - lastFailed = i; + lastKey = pkgKey; } fi->h = headerFree(fi->h, "TR_ADDED fi->h free"); if (hsave) { @@ -1526,7 +1532,7 @@ fi->relocs = relocs; } } else { ourrc++; - lastFailed = i; + lastKey = pkgKey; } h = headerFree(h, "TR_ADDED h free"); @@ -1545,7 +1551,7 @@ fi->relocs = relocs; fi->name, fi->version, fi->release); oc = teGetOc(tei); /* If install failed, then we shouldn't erase. */ - if (ts->order[oc].u.removed.dependsOnIndex != lastFailed) { + if (ts->order[oc].u.removed.dependsOnKey != lastKey) { if (psmStage(psm, PSM_PKGERASE)) ourrc++; } diff --git a/po/cs.po b/po/cs.po index c634645..74ba025 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "Zapsáno: %s\n" @@ -1432,22 +1432,22 @@ msgstr "" msgid " failed - " msgstr "selhal - " -#: lib/depends.c:112 +#: lib/depends.c:113 #, c-format msgid "cannot open Packages database in %s\n" msgstr "nemohu otevøít databázi balíèkù v %s\n" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "balíèek %s je ji¾ nainstalován" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1456,75 +1456,75 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s ANO (rpmrc poskytuje)\n" -#: lib/depends.c:656 +#: lib/depends.c:645 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s ANO (rpmlib poskytuje)\n" -#: lib/depends.c:678 +#: lib/depends.c:666 #, fuzzy msgid "(db files)" msgstr "¹patný db soubor %s\n" -#: lib/depends.c:690 +#: lib/depends.c:678 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s ANO (db poskytuje)\n" -#: lib/depends.c:703 +#: lib/depends.c:691 #, fuzzy msgid "(db package)" msgstr "¾ádné balíèky\n" -#: lib/depends.c:751 +#: lib/depends.c:730 #, 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:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "NE " -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "ANO" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, 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:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "========== ukládání tsort relací\n" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 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:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "SMYÈKA:\n" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "========== pokraèuje tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1629,7 +1629,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "Poèet dataLength() RPM_STRING_TYPE musí být 1.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "Datový typ %d není podporován\n" @@ -2150,173 +2150,173 @@ msgstr "podepsat bal msgid "generate signature" msgstr "generovat PGP/GPG podpis" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " je nutné pro %s-%s-%s\n" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " koliduje s %s-%s-%s\n" -#: lib/problems.c:265 +#: lib/problems.c:268 #, c-format msgid "package %s is for a different architecture" msgstr "balíèek %s je pro jinou architekturu" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "balíèek %s je pro jiný operaèní systém" -#: lib/problems.c:275 +#: lib/problems.c:278 #, c-format msgid "package %s is already installed" msgstr "balíèek %s je ji¾ nainstalován" -#: lib/problems.c:280 +#: lib/problems.c:283 #, c-format msgid "path %s in package %s is not relocateable" msgstr "cesta %s v balíèku %s není pøemístitelná" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "soubor %s zpùsobuje konflikt mezi instalovaným %s a %s" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "soubor %s z instalace %s koliduje se souborem z balíèku %s" -#: lib/problems.c:295 +#: lib/problems.c:298 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "balíèek %s (který je novìj¹í, ne¾ %s) je ji¾ nainstalován" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "instalace balíèku %s potøebuje %ld%cB na systému souborù %s" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "instalace balíèku %s potøebuje %ld inodù na systému souborù %s" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "pøedtransakèní syscall v balíèku %s: %s selhalo: %s" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "neznámá chyba %d vznikla pøi manipulaci s balíèkem %s" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "========== relokace\n" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "%5d vynechávám %s\n" -#: lib/psm.c:275 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d pøemís»uji %s -> %s\n" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "vynechávám multilib cestu %s%s\n" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "vynechávám %s %s\n" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "pøemís»uji %s do %s\n" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "pøemís»uji adresáø %s do %s\n" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "nemohu vytvoøit %s: %s\n" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "nemohu zapsat do %%%s %s\n" -#: lib/psm.c:1195 +#: lib/psm.c:1198 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:1318 +#: lib/psm.c:1321 msgid "source package contains no .spec file\n" msgstr "zdrojový balíèek neobsahuje .spec soubor\n" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: spou¹tím %s skript(y) (pokud existují)\n" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, 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:1603 +#: lib/psm.c:1606 #, 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:1945 +#: lib/psm.c:1948 #, 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:2062 +#: lib/psm.c:2065 #, 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:2176 +#: lib/psm.c:2179 #, 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:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ita skupina root\n" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalování archívu selhalo %s%s: %s\n" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr " na souboru " -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nemohu otevøít %s: %s\n" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s selhalo\n" @@ -2443,12 +2443,17 @@ msgstr "z msgid "package %s is not installed\n" msgstr "balíèek %s není nainstalován\n" -#: lib/rpmal.c:728 +#: 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:826 +#: lib/rpmal.c:803 +#, fuzzy +msgid "(added files)" +msgstr "¹patný db soubor %s\n" + +#: lib/rpmal.c:907 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s ANO (db poskytuje)\n" @@ -2517,7 +2522,7 @@ msgid "OK" msgstr "OK" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2526,13 +2531,13 @@ msgstr "" "Závislost \"B\" potøebuje období (pøedpokládáno stejné jako \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, 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" @@ -2865,13 +2870,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Podpisu: velikost(%d)+vata(%d)\n" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, 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:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "vynechávám adresáø %s\n" diff --git a/po/da.po b/po/da.po index c65ef98..c4f9bbd 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1433,22 +1433,22 @@ msgstr "" msgid " failed - " msgstr " mislykkedes - " -#: lib/depends.c:112 +#: lib/depends.c:113 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kunne ikke åbne Packages-database i %s\n" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "pakken %s er allerede installeret" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1457,75 +1457,75 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s JA (rpmrc tilfører)\n" -#: lib/depends.c:656 +#: lib/depends.c:645 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s JA (rpmlib tilfører)\n" -#: lib/depends.c:678 +#: lib/depends.c:666 #, fuzzy msgid "(db files)" msgstr "ugyldig db-fil %s\n" -#: lib/depends.c:690 +#: lib/depends.c:678 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s JA (db tilfører)\n" -#: lib/depends.c:703 +#: lib/depends.c:691 #, fuzzy msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:751 +#: lib/depends.c:730 #, 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:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 #, fuzzy msgid "NO " msgstr "IKKE O.K." -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, 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:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "========== gemmer tsort-relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "LØKKE:\n" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "========== fortsætter tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1629,7 +1629,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE-antal skal være 1.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "Datatype %d understøttes ikke\n" @@ -2168,176 +2168,176 @@ msgstr "underskriv en pakke (slet nuv msgid "generate signature" msgstr "generér PGP/GPG-signatur" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " kræves af %s-%s-%s\n" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " skaber konflikt med %s-%s-%s\n" -#: lib/problems.c:265 +#: lib/problems.c:268 #, c-format msgid "package %s is for a different architecture" msgstr "pakken %s hører til en anden arkitektur" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "pakken %s hører til et andet operativsystem" -#: lib/problems.c:275 +#: lib/problems.c:278 #, c-format msgid "package %s is already installed" msgstr "pakken %s er allerede installeret" -#: lib/problems.c:280 +#: lib/problems.c:283 #, c-format msgid "path %s in package %s is not relocateable" msgstr "sti %s i pakke %s kan ikke omrokeres" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "filen %s skaber konflikt mellem den forsøgte installation af %s og %s" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" "filen %s fra installationen af %s skaber konflikt med fil fra pakken %s" -#: lib/problems.c:295 +#: lib/problems.c:298 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "pakke %s (som er nyere end %s) er allerede installeret" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "installation af pakke %s kræver %ld%cb på %s-filsystemet" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "installation af pakken %s kræver %ld inode'r på %s-filsystemet" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "pakke %s prætransaktion-systemkald: %s mislykkedes: %s" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ukendt fejl %d under arbejdet med pakken %s" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "========== gemmer omrokeringer\n" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "%5d ekskluderer %s\n" -#: lib/psm.c:275 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d omrokerer %s -> %s\n" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "ekskluderer multilib-sti %s%s\n" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "ekskluderer %s %s\n" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "omrokerer %s til %s\n" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "omrokerer kataloget %s til %s\n" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "kan ikke oprette %s: %s\n" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "kunne ikke skrive til %s\n" -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binær fundet\n" -#: lib/psm.c:1318 +#: lib/psm.c:1321 msgid "source package contains no .spec file\n" msgstr "kildepakke indeholder ingen .spec-fil\n" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "kører postinstallations-skript (hvis det findes)\n" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, 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:1603 +#: lib/psm.c:1606 #, 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:1945 +#: lib/psm.c:1948 #, 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:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "bruger %s eksisterer ikke - bruger root\n" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "gruppe %s eksisterer ikke - bruger root\n" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "udpakning af arkiv mislykkedes%s%s: %s\n" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr " for fil " -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s mislykkedes\n" @@ -2464,12 +2464,17 @@ msgstr "post %d kunne ikke l msgid "package %s is not installed\n" msgstr "pakken %s er ikke installeret\n" -#: lib/rpmal.c:728 +#: 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:826 +#: lib/rpmal.c:803 +#, fuzzy +msgid "(added files)" +msgstr "ugyldig db-fil %s\n" + +#: lib/rpmal.c:907 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s JA (db tilfører)\n" @@ -2538,7 +2543,7 @@ msgid "OK" msgstr "O.K." #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2547,13 +2552,13 @@ msgstr "" "\"B\"-afhængighed kræver en epoke (antager samme som \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" @@ -2887,13 +2892,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signaturfyld : %d\n" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s oversprunget grundet manglende ok-flag\n" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer kataloget %s\n" diff --git a/po/de.po b/po/de.po index 62f6137..3399646 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1568,22 +1568,22 @@ msgstr "" msgid " failed - " msgstr "pgp fehlgeschlagen" -#: lib/depends.c:112 +#: lib/depends.c:113 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "Paket %s ist nicht installiert\n" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1592,76 +1592,76 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 #, fuzzy msgid "(rpmrc provides)" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:656 +#: lib/depends.c:645 #, fuzzy msgid "(rpmlib provides)" msgstr "die Datei »%s« gehört zu keinem Paket\n" # , c-format -#: lib/depends.c:678 +#: lib/depends.c:666 #, fuzzy msgid "(db files)" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/depends.c:690 +#: lib/depends.c:678 #, fuzzy msgid "(db provides)" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:703 +#: lib/depends.c:691 #, fuzzy msgid "(db package)" msgstr "Anfrage an alle Pakete" -#: lib/depends.c:751 +#: lib/depends.c:730 #, 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:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" # FIXME -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, 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:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1769,7 +1769,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2337,183 +2337,183 @@ msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)" msgid "generate signature" msgstr "PGP-Signatur generieren" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " wird von %s-%s-%s gebraucht\n" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " steht im Konflikt mit %s-%s-%s\n" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/problems.c:265 +#: lib/problems.c:268 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/problems.c:270 +#: lib/problems.c:273 #, fuzzy, c-format msgid "package %s is for a different operating system" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/problems.c:275 +#: lib/problems.c:278 #, fuzzy, c-format msgid "package %s is already installed" msgstr "Paket %s ist nicht installiert\n" -#: lib/problems.c:280 +#: lib/problems.c:283 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "Paket %s ist nicht installiert\n" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:293 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr " steht im Konflikt mit %s-%s-%s\n" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/problems.c:295 +#: lib/problems.c:298 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/problems.c:315 +#: lib/problems.c:318 #, fuzzy, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" # , c-format -#: lib/psm.c:272 +#: lib/psm.c:274 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "Hole %s heraus\n" -#: lib/psm.c:275 +#: lib/psm.c:277 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "kann Datei %s nicht öffnen: " # , c-format -#: lib/psm.c:345 +#: lib/psm.c:347 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "Hole %s heraus\n" # , c-format -#: lib/psm.c:411 +#: lib/psm.c:413 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "Hole %s heraus\n" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:500 +#: lib/psm.c:502 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1318 +#: lib/psm.c:1321 #, fuzzy msgid "source package contains no .spec file\n" msgstr "Anfrage nach Paket, das die Datei besitzt" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "Keine Stufen ausführen" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, 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:1603 +#: lib/psm.c:1606 #, 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:1945 +#: lib/psm.c:1948 #, 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:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp fehlgeschlagen" @@ -2645,12 +2645,18 @@ 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:728 +#: lib/rpmal.c:800 #, fuzzy, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/rpmal.c:826 +# , c-format +#: lib/rpmal.c:803 +#, fuzzy +msgid "(added files)" +msgstr "Öffnen von %s fehlgeschlagen: %s" + +#: lib/rpmal.c:907 #, fuzzy msgid "(added provide)" msgstr "die Datei »%s« gehört zu keinem Paket\n" @@ -2721,20 +2727,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" @@ -3084,13 +3090,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" diff --git a/po/en_RN.po b/po/en_RN.po index bd602be..7e81fe1 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,22 +1410,22 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:112 +#: lib/depends.c:113 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1434,69 +1434,69 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:656 +#: lib/depends.c:645 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:666 msgid "(db files)" msgstr "" -#: lib/depends.c:690 +#: lib/depends.c:678 msgid "(db provides)" msgstr "" -#: lib/depends.c:703 +#: lib/depends.c:691 msgid "(db package)" msgstr "" -#: lib/depends.c:751 +#: lib/depends.c:730 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2105,173 +2105,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:265 +#: lib/problems.c:268 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:275 +#: lib/problems.c:278 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:280 +#: lib/problems.c:283 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:295 +#: lib/problems.c:298 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:275 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1318 +#: lib/psm.c:1321 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1603 +#: lib/psm.c:1606 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1945 +#: lib/psm.c:1948 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr "" -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2398,12 +2398,16 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "" -#: lib/rpmal.c:826 +#: lib/rpmal.c:803 +msgid "(added files)" +msgstr "" + +#: lib/rpmal.c:907 msgid "(added provide)" msgstr "" @@ -2471,20 +2475,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2813,13 +2817,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/es.po b/po/es.po index bd602be..7e81fe1 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,22 +1410,22 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:112 +#: lib/depends.c:113 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1434,69 +1434,69 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:656 +#: lib/depends.c:645 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:666 msgid "(db files)" msgstr "" -#: lib/depends.c:690 +#: lib/depends.c:678 msgid "(db provides)" msgstr "" -#: lib/depends.c:703 +#: lib/depends.c:691 msgid "(db package)" msgstr "" -#: lib/depends.c:751 +#: lib/depends.c:730 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2105,173 +2105,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:265 +#: lib/problems.c:268 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:275 +#: lib/problems.c:278 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:280 +#: lib/problems.c:283 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:295 +#: lib/problems.c:298 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:275 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1318 +#: lib/psm.c:1321 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1603 +#: lib/psm.c:1606 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1945 +#: lib/psm.c:1948 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr "" -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2398,12 +2398,16 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "" -#: lib/rpmal.c:826 +#: lib/rpmal.c:803 +msgid "(added files)" +msgstr "" + +#: lib/rpmal.c:907 msgid "(added provide)" msgstr "" @@ -2471,20 +2475,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2813,13 +2817,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/eu_ES.po b/po/eu_ES.po index bd602be..7e81fe1 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,22 +1410,22 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:112 +#: lib/depends.c:113 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1434,69 +1434,69 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:656 +#: lib/depends.c:645 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:666 msgid "(db files)" msgstr "" -#: lib/depends.c:690 +#: lib/depends.c:678 msgid "(db provides)" msgstr "" -#: lib/depends.c:703 +#: lib/depends.c:691 msgid "(db package)" msgstr "" -#: lib/depends.c:751 +#: lib/depends.c:730 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2105,173 +2105,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:265 +#: lib/problems.c:268 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:275 +#: lib/problems.c:278 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:280 +#: lib/problems.c:283 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:295 +#: lib/problems.c:298 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:275 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1318 +#: lib/psm.c:1321 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1603 +#: lib/psm.c:1606 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1945 +#: lib/psm.c:1948 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr "" -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2398,12 +2398,16 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "" -#: lib/rpmal.c:826 +#: lib/rpmal.c:803 +msgid "(added files)" +msgstr "" + +#: lib/rpmal.c:907 msgid "(added provide)" msgstr "" @@ -2471,20 +2475,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2813,13 +2817,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/fi.po b/po/fi.po index 452a1ad..115783f 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1451,22 +1451,22 @@ msgstr "" msgid " failed - " msgstr "pgp epäonnistui" -#: lib/depends.c:112 +#: lib/depends.c:113 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "virhe: en voi avata %s%s/packages.rpm\n" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1475,74 +1475,74 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 #, fuzzy msgid "(rpmrc provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:656 +#: lib/depends.c:645 #, fuzzy msgid "(rpmlib provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:678 +#: lib/depends.c:666 #, fuzzy msgid "(db files)" msgstr "en voinut avata %s: %s" -#: lib/depends.c:690 +#: lib/depends.c:678 #, fuzzy msgid "(db provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:703 +#: lib/depends.c:691 #, fuzzy msgid "(db package)" msgstr "kysele kaikki paketit" -#: lib/depends.c:751 +#: lib/depends.c:730 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1646,7 +1646,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2203,174 +2203,174 @@ msgstr "allekirjoita paketti (hylk msgid "generate signature" msgstr "generoi PGP-allekirjoitus" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "vaatii %s-%s-%s\n" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " on ristiriidassa %s-%s-%s:n kanssa\n" -#: lib/problems.c:265 +#: lib/problems.c:268 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/problems.c:270 +#: lib/problems.c:273 #, fuzzy, c-format msgid "package %s is for a different operating system" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/problems.c:275 +#: lib/problems.c:278 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paketti %s ei ole asennettu\n" -#: lib/problems.c:280 +#: lib/problems.c:283 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paketti %s ei ole asennettu\n" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:293 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr " on ristiriidassa %s-%s-%s:n kanssa\n" -#: lib/problems.c:295 +#: lib/problems.c:298 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:315 +#: lib/problems.c:318 #, fuzzy, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:274 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "Haen: %s\n" -#: lib/psm.c:275 +#: lib/psm.c:277 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/psm.c:345 +#: lib/psm.c:347 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "Haen: %s\n" -#: lib/psm.c:411 +#: lib/psm.c:413 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "Haen: %s\n" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:500 +#: lib/psm.c:502 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1318 +#: lib/psm.c:1321 #, fuzzy msgid "source package contains no .spec file\n" msgstr "kysy pakettia, jonka omistuksessa on" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "älä suorita mitään vaiheita" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, 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:1603 +#: lib/psm.c:1606 #, 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:1945 +#: lib/psm.c:1948 #, 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:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr "" -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp epäonnistui" @@ -2500,12 +2500,17 @@ msgstr "tietuetta %d ei voitu lukea\n" msgid "package %s is not installed\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/rpmal.c:728 +#: 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:826 +#: lib/rpmal.c:803 +#, fuzzy +msgid "(added files)" +msgstr "en voinut avata %s: %s" + +#: lib/rpmal.c:907 #, fuzzy msgid "(added provide)" msgstr "tiedostoa %s ei omista mikään paketti\n" @@ -2576,20 +2581,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "paketti %s ei ole %s:ssä" @@ -2934,13 +2939,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" diff --git a/po/fr.po b/po/fr.po index ade6f19..d5e4ada 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1491,22 +1491,22 @@ msgstr "" msgid " failed - " msgstr "La construction a chou.\n" -#: lib/depends.c:112 +#: lib/depends.c:113 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1515,71 +1515,71 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:656 +#: lib/depends.c:645 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:666 #, fuzzy msgid "(db files)" msgstr "impossible d'ouvrir: %s\n" -#: lib/depends.c:690 +#: lib/depends.c:678 msgid "(db provides)" msgstr "" -#: lib/depends.c:703 +#: lib/depends.c:691 #, fuzzy msgid "(db package)" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/depends.c:751 +#: lib/depends.c:730 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "impossible d'ouvrir: %s\n" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1681,7 +1681,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2253,175 +2253,175 @@ msgstr "" msgid "generate signature" msgstr " --sign - genre une signature PGP" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:265 +#: lib/problems.c:268 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:270 +#: lib/problems.c:273 #, fuzzy, c-format msgid "package %s is for a different operating system" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:275 +#: lib/problems.c:278 #, fuzzy, c-format msgid "package %s is already installed" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:280 +#: lib/problems.c:283 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:295 +#: lib/problems.c:298 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:275 +#: lib/psm.c:277 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:500 +#: lib/psm.c:502 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1318 +#: lib/psm.c:1321 #, fuzzy msgid "source package contains no .spec file\n" msgstr "" " -f + - interroge le package qui appartient " -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1603 +#: lib/psm.c:1606 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1945 +#: lib/psm.c:1948 #, 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:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "La construction a chou.\n" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr "" -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "La construction a chou.\n" @@ -2551,12 +2551,17 @@ msgstr "" msgid "package %s is not installed\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "" -#: lib/rpmal.c:826 +#: lib/rpmal.c:803 +#, fuzzy +msgid "(added files)" +msgstr "impossible d'ouvrir: %s\n" + +#: lib/rpmal.c:907 msgid "(added provide)" msgstr "" @@ -2625,20 +2630,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -2979,13 +2984,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/gl.po b/po/gl.po index 0633ea1..b57521e 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1405,22 +1405,22 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:112 +#: lib/depends.c:113 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1429,69 +1429,69 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:656 +#: lib/depends.c:645 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:666 msgid "(db files)" msgstr "" -#: lib/depends.c:690 +#: lib/depends.c:678 msgid "(db provides)" msgstr "" -#: lib/depends.c:703 +#: lib/depends.c:691 msgid "(db package)" msgstr "" -#: lib/depends.c:751 +#: lib/depends.c:730 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1593,7 +1593,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2100,173 +2100,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:265 +#: lib/problems.c:268 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:275 +#: lib/problems.c:278 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:280 +#: lib/problems.c:283 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:295 +#: lib/problems.c:298 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:275 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1318 +#: lib/psm.c:1321 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1603 +#: lib/psm.c:1606 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1945 +#: lib/psm.c:1948 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr "" -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2393,12 +2393,16 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "" -#: lib/rpmal.c:826 +#: lib/rpmal.c:803 +msgid "(added files)" +msgstr "" + +#: lib/rpmal.c:907 msgid "(added provide)" msgstr "" @@ -2466,20 +2470,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2808,13 +2812,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/hu.po b/po/hu.po index bd602be..7e81fe1 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,22 +1410,22 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:112 +#: lib/depends.c:113 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1434,69 +1434,69 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:656 +#: lib/depends.c:645 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:666 msgid "(db files)" msgstr "" -#: lib/depends.c:690 +#: lib/depends.c:678 msgid "(db provides)" msgstr "" -#: lib/depends.c:703 +#: lib/depends.c:691 msgid "(db package)" msgstr "" -#: lib/depends.c:751 +#: lib/depends.c:730 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2105,173 +2105,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:265 +#: lib/problems.c:268 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:275 +#: lib/problems.c:278 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:280 +#: lib/problems.c:283 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:295 +#: lib/problems.c:298 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:275 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1318 +#: lib/psm.c:1321 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1603 +#: lib/psm.c:1606 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1945 +#: lib/psm.c:1948 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr "" -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2398,12 +2398,16 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "" -#: lib/rpmal.c:826 +#: lib/rpmal.c:803 +msgid "(added files)" +msgstr "" + +#: lib/rpmal.c:907 msgid "(added provide)" msgstr "" @@ -2471,20 +2475,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2813,13 +2817,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/id.po b/po/id.po index bd602be..7e81fe1 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,22 +1410,22 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:112 +#: lib/depends.c:113 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1434,69 +1434,69 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:656 +#: lib/depends.c:645 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:666 msgid "(db files)" msgstr "" -#: lib/depends.c:690 +#: lib/depends.c:678 msgid "(db provides)" msgstr "" -#: lib/depends.c:703 +#: lib/depends.c:691 msgid "(db package)" msgstr "" -#: lib/depends.c:751 +#: lib/depends.c:730 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2105,173 +2105,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:265 +#: lib/problems.c:268 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:275 +#: lib/problems.c:278 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:280 +#: lib/problems.c:283 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:295 +#: lib/problems.c:298 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:275 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1318 +#: lib/psm.c:1321 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1603 +#: lib/psm.c:1606 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1945 +#: lib/psm.c:1948 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr "" -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2398,12 +2398,16 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "" -#: lib/rpmal.c:826 +#: lib/rpmal.c:803 +msgid "(added files)" +msgstr "" + +#: lib/rpmal.c:907 msgid "(added provide)" msgstr "" @@ -2471,20 +2475,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2813,13 +2817,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/is.po b/po/is.po index e763988..6782986 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "Skrifaði: %s\n" @@ -1410,22 +1410,22 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:112 +#: lib/depends.c:113 #, c-format msgid "cannot open Packages database in %s\n" msgstr "get ekki opnað pakka gagnagrunn í\n" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1434,70 +1434,70 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:656 +#: lib/depends.c:645 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:666 msgid "(db files)" msgstr "" -#: lib/depends.c:690 +#: lib/depends.c:678 msgid "(db provides)" msgstr "" -#: lib/depends.c:703 +#: lib/depends.c:691 #, fuzzy msgid "(db package)" msgstr "uppfæra pakka" -#: lib/depends.c:751 +#: lib/depends.c:730 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1599,7 +1599,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2111,173 +2111,173 @@ msgstr "" msgid "generate signature" msgstr "búa til undirskrift" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:265 +#: lib/problems.c:268 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:275 +#: lib/problems.c:278 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:280 +#: lib/problems.c:283 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:295 +#: lib/problems.c:298 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:275 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d færa %s -> %s\n" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "gat ekki búið til %%%s %s\n" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "get ekki ritað í %%%s %s\n" -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1318 +#: lib/psm.c:1321 msgid "source package contains no .spec file\n" msgstr "pakkinn inniheldur enga .spec skrá\n" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1603 +#: lib/psm.c:1606 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1945 +#: lib/psm.c:1948 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr "" -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "gat ekki opnað %s: %s\n" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s brást\n" @@ -2404,12 +2404,16 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "" -#: lib/rpmal.c:826 +#: lib/rpmal.c:803 +msgid "(added files)" +msgstr "" + +#: lib/rpmal.c:907 msgid "(added provide)" msgstr "" @@ -2477,20 +2481,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2819,13 +2823,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/it.po b/po/it.po index bd602be..7e81fe1 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,22 +1410,22 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:112 +#: lib/depends.c:113 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1434,69 +1434,69 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:656 +#: lib/depends.c:645 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:666 msgid "(db files)" msgstr "" -#: lib/depends.c:690 +#: lib/depends.c:678 msgid "(db provides)" msgstr "" -#: lib/depends.c:703 +#: lib/depends.c:691 msgid "(db package)" msgstr "" -#: lib/depends.c:751 +#: lib/depends.c:730 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2105,173 +2105,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:265 +#: lib/problems.c:268 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:275 +#: lib/problems.c:278 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:280 +#: lib/problems.c:283 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:295 +#: lib/problems.c:298 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:275 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1318 +#: lib/psm.c:1321 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1603 +#: lib/psm.c:1606 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1945 +#: lib/psm.c:1948 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr "" -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2398,12 +2398,16 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "" -#: lib/rpmal.c:826 +#: lib/rpmal.c:803 +msgid "(added files)" +msgstr "" + +#: lib/rpmal.c:907 msgid "(added provide)" msgstr "" @@ -2471,20 +2475,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2813,13 +2817,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index 0e30288..46c105d 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "½ñ¤­¹þ¤ßÃæ: %s\n" @@ -1483,22 +1483,22 @@ msgstr "" msgid " failed - " msgstr "¼ºÇÔ - " -#: lib/depends.c:112 +#: lib/depends.c:113 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1507,74 +1507,74 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:656 +#: lib/depends.c:645 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:678 +#: lib/depends.c:666 #, fuzzy msgid "(db files)" msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" -#: lib/depends.c:690 +#: lib/depends.c:678 #, fuzzy msgid "(db provides)" msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:703 +#: lib/depends.c:691 #, fuzzy msgid "(db package)" msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Þ¤·¤¿\n" -#: lib/depends.c:751 +#: lib/depends.c:730 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1679,7 +1679,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabDate() RPM_STRING_TYPE ¥«¥¦¥ó¥È¤Ï 1 ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "¥Ç¡¼¥¿¥¿¥¤¥× %d ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" @@ -2252,185 +2252,185 @@ msgstr " msgid "generate signature" msgstr "PGP/GPG ½ð̾¤òÀ¸À®¤·¤Þ¤¹" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "¤Ï %s-%s-%s ¤ËɬÍפȤµ¤ì¤Æ¤¤¤Þ¤¹\n" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " %s-%s-%s ¤È¶¥¹ç¤·¤Þ¤¹\n" -#: lib/problems.c:265 +#: lib/problems.c:268 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¸þ¤±¤Ç¤¹" -#: lib/problems.c:270 +#: lib/problems.c:273 #, fuzzy, c-format msgid "package %s is for a different operating system" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë OS ¸þ¤±¤Ç¤¹" -#: lib/problems.c:275 +#: lib/problems.c:278 #, fuzzy, c-format msgid "package %s is already installed" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: lib/problems.c:280 +#: lib/problems.c:283 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Þ¤»¤ó" -#: lib/problems.c:285 +#: lib/problems.c:288 #, fuzzy, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" "¥Õ¥¡¥¤¥ë %s ¤Ï %s-%s-%s ¤È %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Î¥Õ¥¡¥¤¥ë¤È¶¥¹ç¤·¤Æ¤¤¤Þ¤¹" -#: lib/problems.c:290 +#: lib/problems.c:293 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" "%s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤«¤é¤Î¥Õ¥¡¥¤¥ë %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤«¤é¤Î¥Õ¥¡¥¤¥ë" "¤È¶¥¹ç¤·¤Æ¤¤¤Þ¤¹" -#: lib/problems.c:295 +#: lib/problems.c:298 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s (%s-%s-%s¤è¤ê¤â¿·¤·¤¤¤â¤Î) ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ" "¤¹" -#: lib/problems.c:300 +#: lib/problems.c:303 #, fuzzy, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å" "¤Ç)" -#: lib/problems.c:310 +#: lib/problems.c:313 #, fuzzy, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å" "¤Ç)" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:322 +#: lib/problems.c:325 #, fuzzy, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼ %d ¤¬¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤ÎÁàºîÃæ¤Ë¤ª¤­¤Þ¤·¤¿" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:274 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "OS ¤Ï½ü³°¤µ¤ì¤Æ¤¤¤Þ¤¹: %s" -#: lib/psm.c:275 +#: lib/psm.c:277 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "%s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n" -#: lib/psm.c:345 +#: lib/psm.c:347 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "¥Õ¥¡¥¤¥ë¤Î½ü³°: %s%s\n" -#: lib/psm.c:411 +#: lib/psm.c:413 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "¥Õ¥¡¥¤¥ë¤Î½ü³°: %s%s\n" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "%s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n" -#: lib/psm.c:500 +#: lib/psm.c:502 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "%s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "%s ¤Ø½ñ¤­¹þ¤á¤Þ¤»¤ó" -#: lib/psm.c:1195 +#: lib/psm.c:1198 #, fuzzy msgid "source package expected, binary found\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Þ¤¹¡¢¥Ð¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Þ¤·¤¿" -#: lib/psm.c:1318 +#: lib/psm.c:1321 #, fuzzy msgid "source package contains no .spec file\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "¥Ý¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" -#: lib/psm.c:1603 +#: lib/psm.c:1606 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" -#: lib/psm.c:1945 +#: lib/psm.c:1948 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n" -#: lib/psm.c:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "¥æ¡¼¥¶ %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "¥°¥ë¡¼¥× %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿­Ä¹¤Ë¼ºÇÔ %s%s: %s" -#: lib/psm.c:2227 +#: lib/psm.c:2230 #, fuzzy msgid " on file " msgstr "¥Õ¥¡¥¤¥ë¾å" -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s ¼ºÇÔ" @@ -2559,12 +2559,17 @@ msgstr " msgid "package %s is not installed\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, fuzzy, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "%s: %s ¤Ï¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/rpmal.c:826 +#: lib/rpmal.c:803 +#, fuzzy +msgid "(added files)" +msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" + +#: lib/rpmal.c:907 #, fuzzy msgid "(added provide)" msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" @@ -2635,7 +2640,7 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2644,13 +2649,13 @@ msgstr "" "\"B\" ¤Î°Í¸À­¤Ï epoch ¤òɬÍפȤ·¤Þ¤¹(\"A\"¤ÈƱ¤¸¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n" @@ -2994,13 +2999,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "½ð̾¥Ñ¥Ã¥É: %d\n" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n" diff --git a/po/ko.po b/po/ko.po index c97e0b8..6b4f8ad 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "ÀÛ¼º: %s\n" @@ -1423,22 +1423,22 @@ msgstr " msgid " failed - " msgstr " ½ÇÆÐÇÔ - " -#: lib/depends.c:112 +#: lib/depends.c:113 #, c-format msgid "cannot open Packages database in %s\n" msgstr "%s ¾ÈÀÇ ÆÐÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "%s ÆÐÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1447,75 +1447,75 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s ¿¹ (rpmrcÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:656 +#: lib/depends.c:645 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s ¿¹ (rpmlibÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:678 +#: lib/depends.c:666 #, fuzzy msgid "(db files)" msgstr "À߸øµÈ db ÆÄÀÏ %s\n" -#: lib/depends.c:690 +#: lib/depends.c:678 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n" -#: lib/depends.c:703 +#: lib/depends.c:691 #, fuzzy msgid "(db package)" msgstr "ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/depends.c:751 +#: lib/depends.c:730 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) ÀÇÁ¸(Depends) ij½Ã¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù.\n" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "¾Æ´Ï¿À" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "¿¹" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort °ü°è¿¡¼­ %s-%s-%s \"%s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== ÆÐÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼­, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, ±íÀÌ[depth])\n" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "========== ÈÄÀÓÀÚ [successors only] (Ç¥Çö ¼ø)\n" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "·çÇÁ(LOOP):\n" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1620,7 +1620,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE Ä«¿îÆ®´Â ¹Ýµå½Ã '1' À̾î¾ß ÇÕ´Ï´Ù.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "%d µ¥ÀÌÅÍ À¯ÇüÀº »ç¿ëÇÏ½Ç ¼ö ¾ø½À´Ï´Ù\n" @@ -2144,185 +2144,185 @@ msgstr " msgid "generate signature" msgstr "¼­¸íÀ» ÀÛ¼ºÇÕ´Ï´Ù" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " (Àº)´Â %s-%s-%s ¿¡¼­ ÇÊ¿ä·Î ÇÕ´Ï´Ù\n" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " %s-%s-%s (¿Í)°ú Ãæµ¹ÇÕ´Ï´Ù\n" -#: lib/problems.c:265 +#: lib/problems.c:268 #, c-format msgid "package %s is for a different architecture" msgstr "%s (Àº)´Â ´Ù¸¥ ¾ÆÅ°ÅØÃĸ¦ À§ÇÑ ÆÐÅ°ÁöÀÔ´Ï´Ù" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "%s (Àº)´Â ´Ù¸¥ ¿î¿µÃ¼Á¦¸¦ À§ÇÑ ÆÐÅ°ÁöÀÔ´Ï´Ù" -#: lib/problems.c:275 +#: lib/problems.c:278 #, c-format msgid "package %s is already installed" msgstr "%s ÆÐÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/problems.c:280 +#: lib/problems.c:283 #, c-format msgid "path %s in package %s is not relocateable" msgstr "%2$s ÆÐÅ°Áö ¾ÈÀÇ %1$s °æ·Î´Â Àç¹èÄ¡ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "%2$s (¿Í)°ú %3$s ÀÇ ¼³Ä¡ °úÁ¤¿¡¼­ %1$s ÆÄÀÏÀÌ ¼­·Î Ãæµ¹ÇÕ´Ï´Ù" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "%2$s ¿¡¼­ ¼³Ä¡µÇ´Â %1$s ÆÄÀÏÀº %3$s ÆÐÅ°ÁöÀÇ ÆÄÀÏ°ú Ãæµ¹ÇÕ´Ï´Ù" -#: lib/problems.c:295 +#: lib/problems.c:298 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "%s ÆÐÅ°Áö (%s º¸´Ù ÃÖ½ÅÀÇ ÆÐÅ°Áö)´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" "%4$s ÆÄÀϽýºÅÛ »ó¿¡¼­ %1$s ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÒ °æ¿ì¿¡´Â %2$ld%3$cb (ÀÌ)°¡ ÇÊ¿äÇÕ" "´Ï´Ù" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" "%3$s ÆÄÀϽýºÅÛ »ó¿¡¼­ %1$s ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÒ °æ¿ì¿¡´Â %2$ld ÀÇ ¾ÆÀ̳ëµå(inode)" "°¡ ÇÊ¿äÇÕ´Ï´Ù" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" "%s ÆÐÅ°ÁöÀÇ ¼±(pre)-Æ®·£Àè¼Ç ½Ã½ºÅÛÄÝ(syscall): %s (ÀÌ)°¡ ½ÇÆÐÇß½À´Ï´Ù: %s" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" "%2$s ÆÐÅ°Áö¸¦ ó¸®ÇÏ´Â °úÁ¤¿¡¼­ ¾Ë ¼ö ¾ø´Â ¿À·ù %1$d (ÀÌ)°¡ ¹ß»ýÇß½À´Ï´Ù" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "========== Àç¹èÄ¡\n" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "%5d Á¦¿Ü(exclude) %s\n" -#: lib/psm.c:275 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d Àç¹èÄ¡ %s -> %s\n" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "%s%s multilib °æ·Î¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "%s %s (À»)¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "%s ¿¡¼­ %s (À¸)·Î Àç¹èÄ¡ ÇÕ´Ï´Ù\n" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "%s µð·ºÅ丮¸¦ %s (À¸)·Î Àç¹èÄ¡ ÇÕ´Ï´Ù\n" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "%%%s %s (À»)¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "%%%s %s (À»)¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "¼Ò½º ÆÐÅ°Áö°¡ ¿ä±¸µË´Ï´Ù, ¹ÙÀ̳ʸ®¸¦ ã¾Ò½À´Ï´Ù\n" -#: lib/psm.c:1318 +#: lib/psm.c:1321 msgid "source package contains no .spec file\n" msgstr "¼Ò½º ÆÐÅ°Áö¿¡ .spec ÆÄÀÏÀÌ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: %s ½ºÅ©¸³Æ®¸¦ ½ÇÇàÇÕ´Ï´Ù (ÀÖÀ» °æ¿ì)\n" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, 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:1603 +#: lib/psm.c:1606 #, 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:1945 +#: lib/psm.c:1948 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s (ÀÌ)°¡ %d ÀÇ ÆÄÀÏÀ» °®°í ÀÖ½À´Ï´Ù, Å×½ºÆ® = %d\n" -#: lib/psm.c:2062 +#: lib/psm.c:2065 #, 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:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "%s »ç¿ëÀÚ°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "%s ±×·ìÀÌ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¾ÆÄ«À̺긦 Ǫ´Âµ¥ ½ÇÆÐÇÔ%s%s: %s\n" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr " ´ÙÀ½ ÆÄÀÏ¿¡ " -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%2$s ÆÄÀÏÀÇ %1$s (ÀÌ)°¡ ½ÇÆÐÇÔ: %3$s\n" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, c-format msgid "%s failed: %s\n" msgstr "%s (ÀÌ)°¡ ½ÇÆÐÇÔ: %s\n" @@ -2449,12 +2449,17 @@ msgstr " msgid "package %s is not installed\n" msgstr "%s ÆÐÅ°Áö´Â ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, fuzzy, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "%s: %-45s ¿¹ (ÆÄÀÏÀÌ Ãß°¡µÊ)\n" -#: lib/rpmal.c:826 +#: lib/rpmal.c:803 +#, fuzzy +msgid "(added files)" +msgstr "À߸øµÈ db ÆÄÀÏ %s\n" + +#: lib/rpmal.c:907 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n" @@ -2523,7 +2528,7 @@ msgid "OK" msgstr "È®ÀÎ" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2532,13 +2537,13 @@ msgstr "" "\"B\" ÀÇÁ¸¼ºÀº Áß¿ä½Ã µÇ´Â °Í(epoch)À» ÇÊ¿ä·Î ÇÕ´Ï´Ù (\"A\" ·Î °¡Á¤ÇÕ´Ï´Ù)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "%s-%s-%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n" @@ -2870,13 +2875,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "¼­¸í: size(%d)+pad(%d)\n" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "missingok Ç÷¡±×·Î ÀÎÇØ %s (À»)¸¦ »ý·«ÇÕ´Ï´Ù\n" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "%s µð·ºÅ丮¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" diff --git a/po/no.po b/po/no.po index eda7061..126d0ce 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1424,22 +1424,22 @@ msgstr "" msgid " failed - " msgstr " feilet - " -#: lib/depends.c:112 +#: lib/depends.c:113 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kan ikke åpne pakkedatabase i %s\n" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "pakke %s er allerede installert" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1448,70 +1448,70 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:656 +#: lib/depends.c:645 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:666 msgid "(db files)" msgstr "" -#: lib/depends.c:690 +#: lib/depends.c:678 msgid "(db provides)" msgstr "" -#: lib/depends.c:703 +#: lib/depends.c:691 #, fuzzy msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:751 +#: lib/depends.c:730 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "NEI" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "JA" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1613,7 +1613,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "Datatype %d ikke støttet\n" @@ -2133,173 +2133,173 @@ msgstr "signer en pakke (forkast n msgid "generate signature" msgstr "generer signatur" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " kreves av %s-%s-%s\n" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " er i konflikt med %s-%s-%s\n" -#: lib/problems.c:265 +#: lib/problems.c:268 #, c-format msgid "package %s is for a different architecture" msgstr "pakke %s er for en annen arkitektur" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "pakke %s er for et annet operativsystem" -#: lib/problems.c:275 +#: lib/problems.c:278 #, c-format msgid "package %s is already installed" msgstr "pakke %s er allerede installert" -#: lib/problems.c:280 +#: lib/problems.c:283 #, c-format msgid "path %s in package %s is not relocateable" msgstr "sti %s i pakke %s kan ikke relokeres" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:295 +#: lib/problems.c:298 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:275 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d omplasser %s -> %s\n" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "ekskluderer multilib-sti %s%s\n" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "eksluderer %s %s\n" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "relokerer %s til %s\n" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "relokerer katalog %s til %s\n" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "kan ikke opprette %%%s %s\n" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "kan ikke skrive til %%%s %s\n" -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binær funnet\n" -#: lib/psm.c:1318 +#: lib/psm.c:1321 msgid "source package contains no .spec file\n" msgstr "kildepakke inneholder ikke en .spec-fil\n" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: kjører %s-skript (hvis noen)\n" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1603 +#: lib/psm.c:1606 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1945 +#: lib/psm.c:1948 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr "" -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "klarte ikke å åpne %s: %s\n" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s feilet\n" @@ -2426,12 +2426,16 @@ msgstr "" msgid "package %s is not installed\n" msgstr "pakke %s er ikke installert\n" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "" -#: lib/rpmal.c:826 +#: lib/rpmal.c:803 +msgid "(added files)" +msgstr "" + +#: lib/rpmal.c:907 msgid "(added provide)" msgstr "" @@ -2499,20 +2503,20 @@ msgid "OK" msgstr "OK" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "pakke %s er i konflikt: %s\n" @@ -2843,13 +2847,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer katalog %s\n" diff --git a/po/pl.po b/po/pl.po index 63a29ae..b22d5ac 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -1465,22 +1465,22 @@ msgstr "" msgid " failed - " msgstr " nie powiod³o siê -" -#: lib/depends.c:112 +#: lib/depends.c:113 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1489,75 +1489,75 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 #, fuzzy msgid "(rpmrc provides)" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:656 +#: lib/depends.c:645 #, fuzzy msgid "(rpmlib provides)" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:678 +#: lib/depends.c:666 #, fuzzy msgid "(db files)" msgstr "b³êdny status pliku: %s" -#: lib/depends.c:690 +#: lib/depends.c:678 #, fuzzy msgid "(db provides)" msgstr "Udostêpniane zasoby:" -#: lib/depends.c:703 +#: lib/depends.c:691 #, fuzzy msgid "(db package)" msgstr "znaleziono %d pakietów\n" -#: lib/depends.c:751 +#: lib/depends.c:730 #, 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:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 #, fuzzy msgid "NO " msgstr "NIE DOBRZE" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "usuwanie indeksu grupy\n" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1662,7 +1662,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabData() RPM_STRING_TYPE licznik musi byæ 1.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "Typ danych %d nie jest obs³ugiwany\n" @@ -2217,177 +2217,177 @@ msgstr "podpisz pakiet (porzu msgid "generate signature" msgstr "generuj sygnaturê PGP/GPG" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " jest wymagany przez %s-%s-%s\n" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " jest w konflikcie z %s-%s-%s\n" -#: lib/problems.c:265 +#: lib/problems.c:268 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "pakiet %s-%s-%s zbudowano dla innej architektury" -#: lib/problems.c:270 +#: lib/problems.c:273 #, fuzzy, c-format msgid "package %s is for a different operating system" msgstr "pakiet %s-%s-%s zbudowano dla innego systemu operacyjnego" -#: lib/problems.c:275 +#: lib/problems.c:278 #, fuzzy, c-format msgid "package %s is already installed" msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany" -#: lib/problems.c:280 +#: lib/problems.c:283 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "pakiet %s nie jest przesuwalny\n" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:293 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" "plik %s z pakietu %s-%s-%s jest w konflikcie z plikiem z pakietu %s-%s-%s" -#: lib/problems.c:295 +#: lib/problems.c:298 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" "pakiet %s-%s-%s (który jest nowszy ni¿ %s-%s-%s) jest ju¿ zainstalowany" -#: lib/problems.c:300 +#: lib/problems.c:303 #, fuzzy, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "instalacja pakietu %s-%s-%s wymaga %ld%c w systemie plików %s" -#: lib/problems.c:310 +#: lib/problems.c:313 #, fuzzy, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "instalacja pakietu %s-%s-%s wymaga %ld%c w systemie plików %s" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:322 +#: lib/problems.c:325 #, fuzzy, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "wyst±pi³ nieznany b³±d %d w trakcie manipulowania pakietem %s-%s-%s" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:274 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "Ten OS nie jest wspierany: %s" -#: lib/psm.c:275 +#: lib/psm.c:277 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "przesuwanie %s do %s\n" -#: lib/psm.c:345 +#: lib/psm.c:347 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "wy³±czanie %s\n" -#: lib/psm.c:411 +#: lib/psm.c:413 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "wy³±czanie %s\n" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "przesuwanie %s do %s\n" -#: lib/psm.c:500 +#: lib/psm.c:502 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "przesuwanie %s do %s\n" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "nie mo¿na utworzyæ %s" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "nie mo¿na zapisaæ do %s" -#: lib/psm.c:1195 +#: lib/psm.c:1198 #, fuzzy msgid "source package expected, binary found\n" msgstr "spodziewany pakiet ¼ród³owy a nie binarny" -#: lib/psm.c:1318 +#: lib/psm.c:1321 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pakiet ¼ród³owy nie zawiera pliku .spec" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, 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:1603 +#: lib/psm.c:1606 #, 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:1945 +#: lib/psm.c:1948 #, 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:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, 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:2185 +#: lib/psm.c:2188 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s nie istnieje - u¿yto grupy root" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, 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:2227 +#: lib/psm.c:2230 msgid " on file " msgstr " na pliku " -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nie mo¿na otworzyæ %s: %s" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s nie powiod³o siê" @@ -2516,12 +2516,17 @@ msgstr "nie mo msgid "package %s is not installed\n" msgstr "pakiet %s nie jest zainstalowany\n" -#: lib/rpmal.c:728 +#: 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:826 +#: lib/rpmal.c:803 +#, fuzzy +msgid "(added files)" +msgstr "b³êdny status pliku: %s" + +#: lib/rpmal.c:907 #, fuzzy msgid "(added provide)" msgstr "Udostêpniane zasoby:" @@ -2591,20 +2596,20 @@ msgid "OK" msgstr "OK" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, fuzzy, c-format msgid " %s A %s\tB %s\n" msgstr " rpm {--version}" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, 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" @@ -2947,13 +2952,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Blok sygnatury: %d\n" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s pominiêty z powodu flagi missingok\n" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "tworzenie katalogu: %s\n" diff --git a/po/pt.po b/po/pt.po index 3d6582c..ff8c455 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "Gravei: %s\n" @@ -1420,22 +1420,22 @@ msgstr "" msgid " failed - " msgstr " falhou - " -#: lib/depends.c:112 +#: lib/depends.c:113 #, 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:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "o pacote %s já está instalado" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1444,75 +1444,75 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s SIM (oferecidos pelo rpmrc)\n" -#: lib/depends.c:656 +#: lib/depends.c:645 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s SIM (oferecidos pela rpmlib)\n" -#: lib/depends.c:678 +#: lib/depends.c:666 #, fuzzy msgid "(db files)" msgstr "ficheiro db inválido %s\n" -#: lib/depends.c:690 +#: lib/depends.c:678 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s SI (oferecidos pelo db)\n" -#: lib/depends.c:703 +#: lib/depends.c:691 #, fuzzy msgid "(db package)" msgstr "nenhum pacote\n" -#: lib/depends.c:751 +#: lib/depends.c:730 #, 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:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 #, fuzzy msgid "NO " msgstr "NÃO-OK" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, 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:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "=========== a guardar as relações do tsort\n" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "========== só os sucessores (ordem de apresentação)\n" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "CICLO:\n" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "========== a prosseguir o tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1616,7 +1616,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "o valor RPM_STRING_TYPE do dataLength() tem de ser 1.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "O tipo de dados %d não é suportado\n" @@ -2147,173 +2147,173 @@ msgstr "assinar um pacote (retira a assinatura actual)" msgid "generate signature" msgstr "gerar a assinatura PGP/GPG" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " é necessário pelo %s-%s-%s\n" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " está em conflito com o %s-%s-%s\n" -#: lib/problems.c:265 +#: lib/problems.c:268 #, c-format msgid "package %s is for a different architecture" msgstr "o pacote %s é para uma arquitectura diferente" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "o pacote %s é para um sistema operativo diferente" -#: lib/problems.c:275 +#: lib/problems.c:278 #, c-format msgid "package %s is already installed" msgstr "o pacote %s já está instalado" -#: lib/problems.c:280 +#: lib/problems.c:283 #, c-format msgid "path %s in package %s is not relocateable" msgstr "a directoria %s no pacote %s não pode ser mudada de sítio" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "o ficheiro %s está em conflito com as tentativas de instalação do %s e %s" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "o ficheiro %s da instalação do %s está em conflito com o ficheiro do pacote %s" -#: lib/problems.c:295 +#: lib/problems.c:298 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "o pacote %s (que é mais recente que o %s) já está instalado" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "a instalação do pacote %s precisa de %ld%cb no sistema de ficheiros %s" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "a instalação do pacote %s precisa de %ld 'inodes' no sistema de ficheiros %s" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "a(s) chamada(s) de pré-transacção do pacote %s: %s falhou: %s" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "encontrado o erro desconhecido %d ao manipular o pacote %s" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "========== mudanças de local\n" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "%5d excluir o %s\n" -#: lib/psm.c:275 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d mudar de local %s -> %s\n" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "a exclur a directoria 'multilib' %s%s\n" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "a excluir o %s %s\n" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "a mudar o %s para %s\n" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "a mudar a directoria %s para %s\n" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "não consigo criar o %s: %s\n" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "não consigo escrever em %s\n" -#: lib/psm.c:1195 +#: lib/psm.c:1198 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:1318 +#: lib/psm.c:1321 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:1428 +#: lib/psm.c:1431 #, 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:1596 +#: lib/psm.c:1599 #, 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:1603 +#: lib/psm.c:1606 #, 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:1945 +#: lib/psm.c:1948 #, 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:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, 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:2185 +#: lib/psm.c:2188 #, 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:2226 +#: lib/psm.c:2229 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "a abertura do pacote falhou%s%s: %s\n" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr " no ficheiro " -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "falhei ao aceder ao %s: %s\n" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "O %s falhou\n" @@ -2440,12 +2440,17 @@ msgstr "o registo %d n msgid "package %s is not installed\n" msgstr "o pacote %s não está instalado\n" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, fuzzy, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "%s: %-45s SIM (ficheiros adicionados)\n" -#: lib/rpmal.c:826 +#: lib/rpmal.c:803 +#, fuzzy +msgid "(added files)" +msgstr "ficheiro db inválido %s\n" + +#: lib/rpmal.c:907 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s SI (oferecidos pelo db)\n" @@ -2514,7 +2519,7 @@ msgid "OK" msgstr "OK" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2523,13 +2528,13 @@ msgstr "" "A dependência \"B\" precisa duma época (assumindo a mesma que \"A\")\n" "\t %s\tB %s\n" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, 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" @@ -2861,13 +2866,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "'Pad' ou preenchimento da assinatura: %d\n" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ignorado devido à opção missingok\n" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "a excluir a directoria %s\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 65ff1b8..6702b40 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1578,22 +1578,22 @@ msgid " failed - " msgstr "Construo falhou.\n" # , c-format -#: lib/depends.c:112 +#: lib/depends.c:113 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "No consegui abrir: %s\n" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "no foi passado pacote para instalao" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1602,73 +1602,73 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:656 +#: lib/depends.c:645 msgid "(rpmlib provides)" msgstr "" # , c-format -#: lib/depends.c:678 +#: lib/depends.c:666 #, fuzzy msgid "(db files)" msgstr "No consegui abrir: %s\n" -#: lib/depends.c:690 +#: lib/depends.c:678 msgid "(db provides)" msgstr "" -#: lib/depends.c:703 +#: lib/depends.c:691 #, fuzzy msgid "(db package)" msgstr "pesquise todos os pacotes" -#: lib/depends.c:751 +#: lib/depends.c:730 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" # , c-format -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "No consegui abrir: %s\n" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1777,7 +1777,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2342,72 +2342,72 @@ msgstr "assine um pacote (descarte a assinatura corrente)" msgid "generate signature" msgstr "gere assinatura PGP" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:265 +#: lib/problems.c:268 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:270 +#: lib/problems.c:273 #, fuzzy, c-format msgid "package %s is for a different operating system" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:275 +#: lib/problems.c:278 #, fuzzy, c-format msgid "package %s is already installed" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:280 +#: lib/problems.c:283 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:295 +#: lib/problems.c:298 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" @@ -2419,13 +2419,13 @@ msgstr "" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/psm.c:272 +#: lib/psm.c:274 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "RPM verso %s\n" # , c-format -#: lib/psm.c:275 +#: lib/psm.c:277 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "No consegui abrir: %s\n" @@ -2438,7 +2438,7 @@ msgstr "No consegui abrir: %s\n" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/psm.c:345 +#: lib/psm.c:347 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "RPM verso %s\n" @@ -2451,94 +2451,94 @@ msgstr "RPM verso %s\n" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/psm.c:411 +#: lib/psm.c:413 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "RPM verso %s\n" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" # , c-format -#: lib/psm.c:500 +#: lib/psm.c:502 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1318 +#: lib/psm.c:1321 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pesquise o pacote ao qual pertence" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "no execute nenhum estgio" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1603 +#: lib/psm.c:1606 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1945 +#: lib/psm.c:1948 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "no foi passado pacote para instalao" -#: lib/psm.c:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "Construo falhou.\n" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "Construo falhou.\n" @@ -2670,12 +2670,18 @@ msgstr "" msgid "package %s is not installed\n" msgstr "no foi passado pacote para instalao" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "" -#: lib/rpmal.c:826 +# , c-format +#: lib/rpmal.c:803 +#, fuzzy +msgid "(added files)" +msgstr "No consegui abrir: %s\n" + +#: lib/rpmal.c:907 msgid "(added provide)" msgstr "" @@ -2747,20 +2753,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "no foi passado pacote para instalao" @@ -3125,7 +3131,7 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3139,7 +3145,7 @@ msgstr "" # "Content-Transfer-Encoding: 8-bit\n" # , c-format #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "RPM verso %s\n" diff --git a/po/ro.po b/po/ro.po index 9503520..d674006 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1405,22 +1405,22 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:112 +#: lib/depends.c:113 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1429,69 +1429,69 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:656 +#: lib/depends.c:645 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:666 msgid "(db files)" msgstr "" -#: lib/depends.c:690 +#: lib/depends.c:678 msgid "(db provides)" msgstr "" -#: lib/depends.c:703 +#: lib/depends.c:691 msgid "(db package)" msgstr "" -#: lib/depends.c:751 +#: lib/depends.c:730 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1593,7 +1593,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2100,173 +2100,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:265 +#: lib/problems.c:268 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:275 +#: lib/problems.c:278 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:280 +#: lib/problems.c:283 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:295 +#: lib/problems.c:298 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:275 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1318 +#: lib/psm.c:1321 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1603 +#: lib/psm.c:1606 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1945 +#: lib/psm.c:1948 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr "" -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2393,12 +2393,16 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "" -#: lib/rpmal.c:826 +#: lib/rpmal.c:803 +msgid "(added files)" +msgstr "" + +#: lib/rpmal.c:907 msgid "(added provide)" msgstr "" @@ -2466,20 +2470,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2808,13 +2812,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index 4a2831d..534619d 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,22 +1410,22 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:112 +#: lib/depends.c:113 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1434,69 +1434,69 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:656 +#: lib/depends.c:645 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:666 msgid "(db files)" msgstr "" -#: lib/depends.c:690 +#: lib/depends.c:678 msgid "(db provides)" msgstr "" -#: lib/depends.c:703 +#: lib/depends.c:691 msgid "(db package)" msgstr "" -#: lib/depends.c:751 +#: lib/depends.c:730 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2105,173 +2105,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:265 +#: lib/problems.c:268 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:275 +#: lib/problems.c:278 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:280 +#: lib/problems.c:283 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:295 +#: lib/problems.c:298 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:275 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1318 +#: lib/psm.c:1321 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1603 +#: lib/psm.c:1606 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1945 +#: lib/psm.c:1948 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr "" -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2398,12 +2398,16 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "" -#: lib/rpmal.c:826 +#: lib/rpmal.c:803 +msgid "(added files)" +msgstr "" + +#: lib/rpmal.c:907 msgid "(added provide)" msgstr "" @@ -2471,20 +2475,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2813,13 +2817,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 4766632..315ad34 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "úÁÐÉÓÁÎ: %s\n" @@ -1441,22 +1441,22 @@ msgstr " msgid " failed - " msgstr "ÎÅ ÕÄÁÌÏÓØ - " -#: lib/depends.c:112 +#: lib/depends.c:113 #, c-format msgid "cannot open Packages database in %s\n" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "ÐÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1465,76 +1465,76 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s YES (rpmrc provides)\n" -#: lib/depends.c:656 +#: lib/depends.c:645 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s YES (rpmlib provides)\n" -#: lib/depends.c:678 +#: lib/depends.c:666 #, fuzzy msgid "(db files)" msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n" -#: lib/depends.c:690 +#: lib/depends.c:678 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s YES (db provides)\n" -#: lib/depends.c:703 +#: lib/depends.c:691 #, fuzzy msgid "(db package)" msgstr "ÎÅÔ ÐÁËÅÔÏ×\n" -#: lib/depends.c:751 +#: lib/depends.c:730 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) ÄÏÂÁ×ÌÅÎÏ × ËÅÛ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "îåT" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "äá" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "========== ÚÁÐÉÓØ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== ÓÏÒÔÉÒÏ×ËÁ ÐÁËÅÔÏ× (ÏÞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, " "ÇÌÕÂÉÎÁ)\n" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "========== ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌÉ (× ÐÏÒÑÄËÅ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ)\n" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "ãéëì:\n" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "========== ÐÒÏÄÏÌÖÅÎÉÅ ÕÐÏÒÑÄÏÞÅÎÉÑ ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1639,7 +1639,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() ÄÏÐÕÓÔÉÍ ÔÏÌØËÏ ÏÄÉÎ ÜÌÅÍÅÎÔ ÔÉÐÁ RPM_STRING_TYPE\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "ôÉÐ ÄÁÎÎÙÈ %d ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n" @@ -2163,173 +2163,173 @@ msgstr " msgid "generate signature" msgstr "ÇÅÎÅÒÉÒÏ×ÁÔØ ÐÏÄÐÉÓØ" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " ÎÕÖÅÎ ÄÌÑ %s-%s-%s\n" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " ËÏÎÆÌÉËÔÕÅÔ Ó %s-%s-%s\n" -#: lib/problems.c:265 +#: lib/problems.c:268 #, c-format msgid "package %s is for a different architecture" msgstr "ÐÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÁÒÈÉÔÅËÔÕÒÙ" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "ÐÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ" -#: lib/problems.c:275 +#: lib/problems.c:278 #, c-format msgid "package %s is already installed" msgstr "ÐÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/problems.c:280 +#: lib/problems.c:283 #, c-format msgid "path %s in package %s is not relocateable" msgstr "ÐÕÔØ %s × ÐÁËÅÔÅ %s - ÎÅ ÐÅÒÅÍÅÝÁÅÍÙÊ" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "ËÏÎÆÌÉËÔ ÆÁÊÌÁ %s ÐÒÉ ÐÏÐÙÔËÁÈ ÕÓÔÁÎÏ×ËÉ %s É %s" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "ÆÁÊÌ %s ÉÚ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ ÐÁËÅÔÁ %s ËÏÎÆÌÉËÔÕÅÔ Ó ÆÁÊÌÏÍ ÉÚ ÐÁËÅÔÁ %s" -#: lib/problems.c:295 +#: lib/problems.c:298 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "ÐÁËÅÔ %s (ËÏÔÏÒÙÊ ÎÏ×ÅÅ, ÞÅÍ %s) ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ %s ÎÕÖÎÏ %ld%cb ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ %s ÎÕÖÎÏ %ld inodes ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "ÐÁËÅÔ %s pre-transaction syscall(s): %s: ÏÛÉÂËÁ: %s" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ %d ÐÒÉ ÒÁÂÏÔÅ Ó ÐÁËÅÔÏÍ %s" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "========== ÐÅÒÅÍÅÝÅÎÉÊ\n" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "%5d ÉÓËÌÀÞÅÎ %s\n" -#: lib/psm.c:275 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d ÐÅÒÅÍÅÝÅÎÉÅ %s -> %s\n" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "ÉÓËÌÀÞÁÅÔÓÑ ÍÎÏÇÏÂÉÂÌÉÏÔÅÞÎÙÊ ÐÕÔØ %s%s\n" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "ÉÓËÌÀÞÁÅÔÓÑ %s %s\n" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "ÐÅÒÅÍÅÝÁÅÔÓÑ %s × %s\n" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "ÐÅÒÅÍÅÝÁÅÔÓÑ ËÁÔÁÌÏÇ %s × %s\n" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %%%s %s\n" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÉÓÁÔØ × %%%s %s\n" -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "ÏÂÎÁÒÕÖÅÎ Ä×ÏÉÞÎÙÊ ÐÁËÅÔ ×ÍÅÓÔÏ ÏÖÉÄÁÅÍÏÇÏ ÉÓÈÏÄÎÏÇÏ\n" -#: lib/psm.c:1318 +#: lib/psm.c:1321 msgid "source package contains no .spec file\n" msgstr "ÉÓÈÏÄÎÙÊ ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ\n" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: ×ÙÐÏÌÎÑÅÔÓÑ ÓÃÅÎÁÒÉÊ %s (ÅÓÌÉ ÅÓÔØ)\n" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, 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:1603 +#: lib/psm.c:1606 #, 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:1945 +#: lib/psm.c:1948 #, 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:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "%s: ÏÛÉÂËÁ ÓÃÅÎÁÒÉÑ %s (%d), %s-%s-%s ÐÒÏÐÕÓËÁÅÔÓÑ\n" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "ÐÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "ÇÒÕÐÐÁ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "ÒÁÓÐÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s\n" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr " ÎÁ ÆÁÊÌÅ " -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ÏÛÉÂËÁ ÎÁ ÆÁÊÌÅ %s: %s\n" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, c-format msgid "%s failed: %s\n" msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n" @@ -2456,12 +2456,17 @@ msgstr " msgid "package %s is not installed\n" msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, fuzzy, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "%s: %-45s YES (added files)\n" -#: lib/rpmal.c:826 +#: lib/rpmal.c:803 +#, fuzzy +msgid "(added files)" +msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n" + +#: lib/rpmal.c:907 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s YES (db provides)\n" @@ -2530,7 +2535,7 @@ msgid "OK" msgstr "Oë" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2539,13 +2544,13 @@ msgstr "" "ÄÌÑ ÚÁ×ÉÓÉÍÏÓÔÉ \"B\" ÎÕÖÎÏ ÕËÁÚÁÔØ \"epoch\" (ÔÁË ÖÅ ËÁË ÄÌÑ \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n" @@ -2878,13 +2883,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "ðÏÄÐÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁÐÏÌÎÅÎÉÅ(%d)\n" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ÐÒÏÐÕÝÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "ÉÓËÌÀÞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n" diff --git a/po/sk.po b/po/sk.po index 8ffa39e..8837b0b 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "Zapísané: %s\n" @@ -1464,22 +1464,22 @@ msgstr "" msgid " failed - " msgstr " zlyhalo - " -#: lib/depends.c:112 +#: lib/depends.c:113 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "nie je mo¾né otvori» %s/packages.rpm\n" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1488,75 +1488,75 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 #, fuzzy msgid "(rpmrc provides)" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:656 +#: lib/depends.c:645 #, fuzzy msgid "(rpmlib provides)" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:678 +#: lib/depends.c:666 #, fuzzy msgid "(db files)" msgstr "chybný stav súboru: %s" -#: lib/depends.c:690 +#: lib/depends.c:678 #, fuzzy msgid "(db provides)" msgstr "Poskytuje:" -#: lib/depends.c:703 +#: lib/depends.c:691 #, fuzzy msgid "(db package)" msgstr "nájdených %d balíkov\n" -#: lib/depends.c:751 +#: lib/depends.c:730 #, 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:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 #, fuzzy msgid "NO " msgstr "NIE JE V PORIADKU" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, 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:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1661,7 +1661,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabData() RPM_STRING_TYPE poèet musí by» 1.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "Typ údajov %d nie je podorovaný\n" @@ -2216,175 +2216,175 @@ msgstr "podp msgid "generate signature" msgstr "vytvori» PGP/GPG podpis" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " je vy¾adované %s-%s-%s\n" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " koliduje s %s-%s-%s\n" -#: lib/problems.c:265 +#: lib/problems.c:268 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:275 +#: lib/problems.c:278 #, fuzzy, c-format msgid "package %s is already installed" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/problems.c:280 +#: lib/problems.c:283 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:295 +#: lib/problems.c:298 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:274 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "OS je vynechaný: %s" -#: lib/psm.c:275 +#: lib/psm.c:277 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "presúva sa %s do %s\n" -#: lib/psm.c:345 +#: lib/psm.c:347 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "vynecháva sa %s\n" -#: lib/psm.c:411 +#: lib/psm.c:413 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "vynecháva sa %s\n" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "presúva sa %s do %s\n" -#: lib/psm.c:500 +#: lib/psm.c:502 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "presúva sa %s do %s\n" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "nie je mo¾né zapísa» do %s: " -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "nie je mo¾né zapísa» do %s: " -#: lib/psm.c:1195 +#: lib/psm.c:1198 #, fuzzy msgid "source package expected, binary found\n" msgstr "oèakávaný zdrojový balík, nájdený binárny" -#: lib/psm.c:1318 +#: lib/psm.c:1321 #, fuzzy msgid "source package contains no .spec file\n" msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "vykonanie skriptu zlyhalo" -#: lib/psm.c:1603 +#: lib/psm.c:1606 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "vykonanie skriptu zlyhalo" -#: lib/psm.c:1945 +#: lib/psm.c:1948 #, 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:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "pou¾ívateµ %s neexistuje - pou¾ije sa root" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ije sa root" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalenie archívu zlyhalo%s%s: %s" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr " pre súbor " -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nepodarilo sa otvori» %s: %s" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s zlyhalo" @@ -2513,12 +2513,17 @@ msgstr "z msgid "package %s is not installed\n" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/rpmal.c:728 +#: 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:826 +#: lib/rpmal.c:803 +#, fuzzy +msgid "(added files)" +msgstr "chybný stav súboru: %s" + +#: lib/rpmal.c:907 #, fuzzy msgid "(added provide)" msgstr "Poskytuje:" @@ -2588,20 +2593,20 @@ msgid "OK" msgstr "V PORIADKU" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, fuzzy, c-format msgid " %s A %s\tB %s\n" msgstr " rpm {--version}" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" @@ -2944,13 +2949,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Doplnenie podpisu: %d\n" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s vynechané kvôli príznaku missingok\n" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "vytvára sa adresár %s\n" diff --git a/po/sl.po b/po/sl.po index 002b02c..07e072a 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.190 2001/11/04 17:00:07 jbj Exp $ +# $Id: sl.po,v 1.191 2001/11/04 22:00:27 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-04 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -1465,22 +1465,22 @@ msgstr "" msgid " failed - " msgstr " neuspe¹no - " -#: lib/depends.c:112 +#: lib/depends.c:113 #, 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:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paket %s-%s-%s je ¾e name¹èen" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1489,75 +1489,75 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s DA (rpmrc ponudbe)\n" -#: lib/depends.c:656 +#: lib/depends.c:645 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s DA (rpmlib ponudbe)\n" -#: lib/depends.c:678 +#: lib/depends.c:666 #, fuzzy msgid "(db files)" msgstr "po¹kodovana zbirka podatkov %s" -#: lib/depends.c:690 +#: lib/depends.c:678 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s DA (db ponudbe)\n" -#: lib/depends.c:703 +#: lib/depends.c:691 #, fuzzy msgid "(db package)" msgstr "ni paketov\n" -#: lib/depends.c:751 +#: lib/depends.c:730 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 #, fuzzy msgid "NO " msgstr "NI DOBRO" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstranjujemo seznam skupin\n" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1662,7 +1662,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "¹tevec grabData() RPM_STRING_TYPE mora biti 1.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "Tip podatkov %d ni podprt\n" @@ -2214,176 +2214,176 @@ msgstr "podpi msgid "generate signature" msgstr "izdelava podpisa PGP/GPG" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " potrebuje %s-%s-%s\n" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " je v sporu z %s-%s-%s\n" -#: lib/problems.c:265 +#: lib/problems.c:268 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "paket %s-%s-%s je za drug tip arhitekture" -#: lib/problems.c:270 +#: lib/problems.c:273 #, fuzzy, c-format msgid "package %s is for a different operating system" msgstr "paket %s-%s-%s je za drug operacijski sistem" -#: lib/problems.c:275 +#: lib/problems.c:278 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paket %s-%s-%s je ¾e name¹èen" -#: lib/problems.c:280 +#: lib/problems.c:283 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paketa %s ni mo¾no prestaviti\n" -#: lib/problems.c:285 +#: lib/problems.c:288 #, fuzzy, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "datoteka %s je v sporu med poskusom namestitve %s in %s" -#: lib/problems.c:290 +#: lib/problems.c:293 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" "datoteka %s name¹èena z %s-%s-%s je v sporu z datoteko iz paketa %s-%s-%s" -#: lib/problems.c:295 +#: lib/problems.c:298 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "paket %s-%s-%s (ki je novej¹i kot %s-%s-%s) je ¾e name¹èen" -#: lib/problems.c:300 +#: lib/problems.c:303 #, fuzzy, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "namestitev paketa %s-%s-%s zahteva %ld%cb na datoteènem sistemu %s" -#: lib/problems.c:310 +#: lib/problems.c:313 #, fuzzy, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "paket %s pred-prenosljivih sistemskih klicov: %s ni uspelo: %s" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:322 +#: lib/problems.c:325 #, fuzzy, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "neznana napaka %d ob rokovanju s paketom %s-%s-%s" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:274 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "OS je izkljuèen: %s" -#: lib/psm.c:275 +#: lib/psm.c:277 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "premikanje %s v %s\n" -#: lib/psm.c:345 +#: lib/psm.c:347 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "izkljuèevanje datoteke %s%s\n" -#: lib/psm.c:411 +#: lib/psm.c:413 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "izkljuèevanje datoteke %s%s\n" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "premikanje %s v %s\n" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "premiokanje imenika %s v %s\n" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "ni mo¾no ustvariti %s: %s\n" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "pisanje na %s ni mo¾no" -#: lib/psm.c:1195 +#: lib/psm.c:1198 #, fuzzy msgid "source package expected, binary found\n" msgstr "prièakovan je bil izvorni paket, najden binarni" -#: lib/psm.c:1318 +#: lib/psm.c:1321 #, fuzzy msgid "source package contains no .spec file\n" msgstr "izvorni paket ne vsebuje datoteke .spec" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "poganjanje ponamestitvenih skript (èe obstajajo)\n" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, 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:1603 +#: lib/psm.c:1606 #, 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:1945 +#: lib/psm.c:1948 #, 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:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "uporabnik %s ne obstaja - uporabljam root" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s ne obstaja - uporabljam root" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, 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:2227 +#: lib/psm.c:2230 msgid " on file " msgstr " za datoteko " -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspe¹no odpiranje %s: %s\n" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s neuspe¹en" @@ -2512,12 +2512,17 @@ msgstr "zapisa %d ni mo msgid "package %s is not installed\n" msgstr "paket %s ni name¹èen\n" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, fuzzy, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "%s: %-45s DA (dodane datoteke)\n" -#: lib/rpmal.c:826 +#: lib/rpmal.c:803 +#, fuzzy +msgid "(added files)" +msgstr "po¹kodovana zbirka podatkov %s" + +#: lib/rpmal.c:907 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s DA (db ponudbe)\n" @@ -2586,7 +2591,7 @@ msgid "OK" msgstr "V REDU" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2595,13 +2600,13 @@ msgstr "" "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" @@ -2942,13 +2947,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Dol¾. polnila : %d\n" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s preskoèen zaradi manjkajoèe zastavice OK\n" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "izkljuèevanje imenika %s\n" diff --git a/po/sr.po b/po/sr.po index 9ce0901..b20d878 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1449,22 +1449,22 @@ msgstr "" msgid " failed - " msgstr "PGP omanuo" -#: lib/depends.c:112 +#: lib/depends.c:113 #, 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:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paket %s nije instaliran\n" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1473,74 +1473,74 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 #, fuzzy msgid "(rpmrc provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:656 +#: lib/depends.c:645 #, fuzzy msgid "(rpmlib provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:678 +#: lib/depends.c:666 #, fuzzy msgid "(db files)" msgstr "neuspelo otvaranje %s: %s" -#: lib/depends.c:690 +#: lib/depends.c:678 #, fuzzy msgid "(db provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:703 +#: lib/depends.c:691 #, fuzzy msgid "(db package)" msgstr "upit nad svim paketima" -#: lib/depends.c:751 +#: lib/depends.c:730 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, 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:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1644,7 +1644,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2202,174 +2202,174 @@ msgstr "potpi msgid "generate signature" msgstr "napravi PGP potpis" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " je potreban paketu %s-%s-%s\n" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " se sudara sa %s-%s-%s\n" -#: lib/problems.c:265 +#: lib/problems.c:268 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/problems.c:270 +#: lib/problems.c:273 #, fuzzy, c-format msgid "package %s is for a different operating system" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/problems.c:275 +#: lib/problems.c:278 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paket %s nije instaliran\n" -#: lib/problems.c:280 +#: lib/problems.c:283 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paket %s nije instaliran\n" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:293 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr " se sudara sa %s-%s-%s\n" -#: lib/problems.c:295 +#: lib/problems.c:298 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:315 +#: lib/problems.c:318 #, fuzzy, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:274 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "Pribavljam %s\n" -#: lib/psm.c:275 +#: lib/psm.c:277 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/psm.c:345 +#: lib/psm.c:347 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "Pribavljam %s\n" -#: lib/psm.c:411 +#: lib/psm.c:413 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "Pribavljam %s\n" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:500 +#: lib/psm.c:502 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1318 +#: lib/psm.c:1321 #, fuzzy msgid "source package contains no .spec file\n" msgstr "upit nad paketom koji ima " -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "nemoj izvr¹iti nijednu fazu" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, 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:1603 +#: lib/psm.c:1606 #, 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:1945 +#: lib/psm.c:1948 #, 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:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr "" -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "PGP omanuo" @@ -2499,12 +2499,17 @@ msgstr "ne mogu da pro msgid "package %s is not installed\n" msgstr "paket %s nije instaliran\n" -#: lib/rpmal.c:728 +#: 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:826 +#: lib/rpmal.c:803 +#, fuzzy +msgid "(added files)" +msgstr "neuspelo otvaranje %s: %s" + +#: lib/rpmal.c:907 #, fuzzy msgid "(added provide)" msgstr "datoteka %s ne pripada nijednom paketu\n" @@ -2575,20 +2580,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "paket %s nije naveden u %s" @@ -2933,13 +2938,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" diff --git a/po/sv.po b/po/sv.po index 091f3d5..ff6cde6 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1426,22 +1426,22 @@ msgstr "Ingen arkivfilen i huvud" msgid " failed - " msgstr " misslyckades - " -#: lib/depends.c:112 +#: lib/depends.c:113 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kan inte öppna paketdatabas i %s\n" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paket %s är redan installerat" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1450,75 +1450,75 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n" -#: lib/depends.c:656 +#: lib/depends.c:645 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s JA (rpmlib tillhandahåller)\n" -#: lib/depends.c:678 +#: lib/depends.c:666 #, fuzzy msgid "(db files)" msgstr "felaktig db-fil %s\n" -#: lib/depends.c:690 +#: lib/depends.c:678 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s JA (db-tillhandahållande)\n" -#: lib/depends.c:703 +#: lib/depends.c:691 #, fuzzy msgid "(db package)" msgstr "inga paket\n" -#: lib/depends.c:751 +#: lib/depends.c:730 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) tillagt till beroendecachen.\n" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "NEJ " -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "JA" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, 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:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "========== noterar alla relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== tsort:erar paket (ordning, #föregångare, #efterföljare, djup)\n" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "========== endast efterföljare (presentationsordning)\n" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "LOOP:\n" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "========== fortsätter med tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1623,7 +1623,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE antal måste vara 1.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "Datatyp %d stöds inte\n" @@ -2146,174 +2146,174 @@ msgstr "signera ett paket (sl msgid "generate signature" msgstr "generera signatur" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " behövs av %s-%s-%s\n" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " står i konflikt med %s-%s-%s\n" -#: lib/problems.c:265 +#: lib/problems.c:268 #, c-format msgid "package %s is for a different architecture" msgstr "paket %s är för en annan arkitektur" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "paket %s är för ett annat operativsystem" -#: lib/problems.c:275 +#: lib/problems.c:278 #, c-format msgid "package %s is already installed" msgstr "paket %s är redan installerat" -#: lib/problems.c:280 +#: lib/problems.c:283 #, c-format msgid "path %s in package %s is not relocateable" msgstr "sökväg %s i paket %s är inte relokerbar" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "fil %s är en konflikt mellan installationsförsök av %s och %s" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "fil %s från installation av %s står i konflikt med filen från paket %s" -#: lib/problems.c:295 +#: lib/problems.c:298 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "paket %s (som är nyare än %s) är redan installerat" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "installation av paket %s kräver %ld%cB på filsystem %s" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "installation av paket %s kräver %ld inoder på filsystem %s" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "paket %s systemanrop före transaktion: %s misslyckades: %s" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "okänt fel %d uppträdde under behandling av paket %s" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "========== omflyttningar\n" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "%5d utesluter %s\n" -#: lib/psm.c:275 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d flyttar om %s -> %s\n" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "hoppar över multilib-sökväg %s%s\n" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "hoppar över %s %s\n" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "flyttar %s till %s\n" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "flyttar katalogen %s till %s\n" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "kan inte skapa %%%s %s\n" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "kan inte skriva till %%%s %s\n" -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "källpaket förväntades, fann binärpaket\n" -#: lib/psm.c:1318 +#: lib/psm.c:1321 msgid "source package contains no .spec file\n" msgstr "källpaket innehåller ingen .spec-fil\n" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: kör (eventuellt) %s-skript\n" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, 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:1603 +#: lib/psm.c:1606 #, 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:1945 +#: lib/psm.c:1948 #, 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:2062 +#: lib/psm.c:2065 #, 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:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "användare %s finns inte - använder root\n" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "grupp %s finns inte - använder root\n" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "uppackning av arkiv misslyckades%s%s: %s\n" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr " vid fil " -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s misslyckades på fil %s: %s\n" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, c-format msgid "%s failed: %s\n" msgstr "%s misslyckades: %s\n" @@ -2440,12 +2440,17 @@ msgstr "post %u kunde inte l msgid "package %s is not installed\n" msgstr "paket %s är inte installerat\n" -#: lib/rpmal.c:728 +#: 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:826 +#: lib/rpmal.c:803 +#, fuzzy +msgid "(added files)" +msgstr "felaktig db-fil %s\n" + +#: lib/rpmal.c:907 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s JA (db-tillhandahållande)\n" @@ -2514,7 +2519,7 @@ msgid "OK" msgstr "OK" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2523,13 +2528,13 @@ msgstr "" "\"B\"-beroendet behöver en epok (antar samma som \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, fuzzy, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n" @@ -2863,13 +2868,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s överhoppad på grund av missingok-flagga\n" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "hoppar över katalogen %s\n" diff --git a/po/tr.po b/po/tr.po index 82076eb..6fd71be 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "Yazýldý: %s\n" @@ -1446,22 +1446,22 @@ msgstr "" msgid " failed - " msgstr " baþarýsýz - " -#: lib/depends.c:112 +#: lib/depends.c:113 #, c-format msgid "cannot open Packages database in %s\n" msgstr "%s de Paket veritabaný açýlamadý\n" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "%s zaten kurulu" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1470,75 +1470,75 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s EVET (rpmrc saðlar)\n" -#: lib/depends.c:656 +#: lib/depends.c:645 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s EVET (rpmlib saðlar)\n" -#: lib/depends.c:678 +#: lib/depends.c:666 #, fuzzy msgid "(db files)" msgstr "db dosyasý %s hatalý\n" -#: lib/depends.c:690 +#: lib/depends.c:678 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s EVET (db saðlar)\n" -#: lib/depends.c:703 +#: lib/depends.c:691 #, fuzzy msgid "(db package)" msgstr "paket yok\n" -#: lib/depends.c:751 +#: lib/depends.c:730 #, 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:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "HAYIR " -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "EVET" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, 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:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "========== tsort baðýntýlarý kaydediliyor\n" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== paketler tsort'lanýyor (sýra, #öncüller, #ardýllar, derinlik)\n" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "========== sadece ardýllar (sunum sýrasý)\n" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "ÇEVRÝM:\n" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "========== tsort sürüyor ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1643,7 +1643,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE sayýsý 1 olmalý.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "%d veri türü desteklenmiyor\n" @@ -2170,173 +2170,173 @@ msgstr "paketi imzalar (mevcut imza kald msgid "generate signature" msgstr "imza üretir" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " %s-%s-%s için gerekli\n" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " %s-%s-%s ile çeliþiyor\n" -#: lib/problems.c:265 +#: lib/problems.c:268 #, c-format msgid "package %s is for a different architecture" msgstr "%s farklý bir mimari için" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "%s farklý bir iþletim sistemi için" -#: lib/problems.c:275 +#: lib/problems.c:278 #, c-format msgid "package %s is already installed" msgstr "%s zaten kurulu" -#: lib/problems.c:280 +#: lib/problems.c:283 #, c-format msgid "path %s in package %s is not relocateable" msgstr "%s dosya yolu %s paketinde yeniden konumlandýrýlamaz" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "%s dosyasý kalkýþýlan %s ve %s kurulumlarý arasýnda çeliþiyor" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "%s dosyasýnýn %s kurulumu %s kurulumundaki dosya ile çeliþiyor" -#: lib/problems.c:295 +#: lib/problems.c:298 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "%s paketi zaten yüklü (%s sürümünden daha yeni)" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "%s kurulumu %ld%cb gerektiriyor (%s dosya sisteminde)" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "%s kurulumu %ld i-düðüm gerektiriyor (%s dosya sisteminde)" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "%s iþlem öncesi sistem çaðrý(sý/larý): %s baþarýsýz: %s" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "anlaþýlamayan %d hatasý, %s paketi iþlenirken saptandý" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "========== yeniden konumlama\n" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "%5d %s'i dýþlýyor\n" -#: lib/psm.c:275 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d yeniden konumlandýrýlýyor: %s -> %s\n" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "multilib dosya yolu dýþlanýyor %s%s\n" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "%s %s dýþlanýyor\n" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "%s %s'e konumlanýyor\n" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "%s dizini %s de yeniden konumlanýyor\n" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "%%%s dosyasý oluþturulamýyor: %s\n" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "%%%s dosyasýna yazýlamaz %s\n" -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "kaynak paketi gerekirken çalýþtýrýlabilir paketi bulundu\n" -#: lib/psm.c:1318 +#: lib/psm.c:1321 msgid "source package contains no .spec file\n" msgstr "kaynak paketi .spec dosyasý içermiyor\n" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: %s betiði çalýþtýrýlýyor (varsa)\n" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, 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:1603 +#: lib/psm.c:1606 #, 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:1945 +#: lib/psm.c:1948 #, 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:2062 +#: lib/psm.c:2065 #, 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:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "kullanýcý %s yok - root kullanýlacak\n" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "grup %s yok - root kullanýlacak\n" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, 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:2227 +#: lib/psm.c:2230 msgid " on file " msgstr " dosyada " -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s baþarýsýz\n" @@ -2463,12 +2463,17 @@ msgstr "%u. kay msgid "package %s is not installed\n" msgstr "%s paketi kurulu deðil\n" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, fuzzy, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "%s: %-45s EVET (dosyalar eklendi)\n" -#: lib/rpmal.c:826 +#: lib/rpmal.c:803 +#, fuzzy +msgid "(added files)" +msgstr "db dosyasý %s hatalý\n" + +#: lib/rpmal.c:907 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s EVET (db saðlar)\n" @@ -2537,7 +2542,7 @@ msgid "OK" msgstr "Tamam" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, fuzzy, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2546,13 +2551,13 @@ msgstr "" "\"B\" baðýmlýlýðý bir dönemsellik gerektirir (tabii ki \"A\" da)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, 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" @@ -2884,13 +2889,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Ýmza: boyut(%d)+iz(%d)\n" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "missingok flamasýndan dolayý %s atlandý\n" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "%s dizini dýþlanýyor\n" diff --git a/po/uk.po b/po/uk.po index bd602be..7e81fe1 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,22 +1410,22 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:112 +#: lib/depends.c:113 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1434,69 +1434,69 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:656 +#: lib/depends.c:645 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:666 msgid "(db files)" msgstr "" -#: lib/depends.c:690 +#: lib/depends.c:678 msgid "(db provides)" msgstr "" -#: lib/depends.c:703 +#: lib/depends.c:691 msgid "(db package)" msgstr "" -#: lib/depends.c:751 +#: lib/depends.c:730 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2105,173 +2105,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:265 +#: lib/problems.c:268 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:275 +#: lib/problems.c:278 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:280 +#: lib/problems.c:283 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:295 +#: lib/problems.c:298 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:275 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1318 +#: lib/psm.c:1321 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1603 +#: lib/psm.c:1606 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1945 +#: lib/psm.c:1948 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr "" -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2398,12 +2398,16 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "" -#: lib/rpmal.c:826 +#: lib/rpmal.c:803 +msgid "(added files)" +msgstr "" + +#: lib/rpmal.c:907 msgid "(added provide)" msgstr "" @@ -2471,20 +2475,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2813,13 +2817,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/wa.po b/po/wa.po index bd602be..7e81fe1 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,22 +1410,22 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:112 +#: lib/depends.c:113 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1434,69 +1434,69 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:656 +#: lib/depends.c:645 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:666 msgid "(db files)" msgstr "" -#: lib/depends.c:690 +#: lib/depends.c:678 msgid "(db provides)" msgstr "" -#: lib/depends.c:703 +#: lib/depends.c:691 msgid "(db package)" msgstr "" -#: lib/depends.c:751 +#: lib/depends.c:730 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2105,173 +2105,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:265 +#: lib/problems.c:268 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:275 +#: lib/problems.c:278 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:280 +#: lib/problems.c:283 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:295 +#: lib/problems.c:298 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:275 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1318 +#: lib/psm.c:1321 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1603 +#: lib/psm.c:1606 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1945 +#: lib/psm.c:1948 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr "" -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2398,12 +2398,16 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "" -#: lib/rpmal.c:826 +#: lib/rpmal.c:803 +msgid "(added files)" +msgstr "" + +#: lib/rpmal.c:907 msgid "(added provide)" msgstr "" @@ -2471,20 +2475,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2813,13 +2817,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/zh.po b/po/zh.po index bd602be..7e81fe1 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,22 +1410,22 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:112 +#: lib/depends.c:113 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1434,69 +1434,69 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:656 +#: lib/depends.c:645 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:666 msgid "(db files)" msgstr "" -#: lib/depends.c:690 +#: lib/depends.c:678 msgid "(db provides)" msgstr "" -#: lib/depends.c:703 +#: lib/depends.c:691 msgid "(db package)" msgstr "" -#: lib/depends.c:751 +#: lib/depends.c:730 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2105,173 +2105,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:265 +#: lib/problems.c:268 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:275 +#: lib/problems.c:278 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:280 +#: lib/problems.c:283 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:295 +#: lib/problems.c:298 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:275 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1318 +#: lib/psm.c:1321 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1603 +#: lib/psm.c:1606 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1945 +#: lib/psm.c:1948 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr "" -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2398,12 +2398,16 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "" -#: lib/rpmal.c:826 +#: lib/rpmal.c:803 +msgid "(added files)" +msgstr "" + +#: lib/rpmal.c:907 msgid "(added provide)" msgstr "" @@ -2471,20 +2475,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2813,13 +2817,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index bd602be..7e81fe1 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 11:57-0500\n" +"POT-Creation-Date: 2001-11-04 16:55-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:2140 +#: build/pack.c:603 lib/psm.c:2143 #, 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:2405 +#: build/pack.c:683 lib/psm.c:2408 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,22 +1410,22 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:112 +#: lib/depends.c:113 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:345 +#: lib/depends.c:349 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:350 +#: lib/depends.c:354 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:355 +#: lib/depends.c:359 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" @@ -1434,69 +1434,69 @@ msgstr "" msgid "(cached)" msgstr "" -#: lib/depends.c:640 +#: lib/depends.c:629 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:656 +#: lib/depends.c:645 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:678 +#: lib/depends.c:666 msgid "(db files)" msgstr "" -#: lib/depends.c:690 +#: lib/depends.c:678 msgid "(db provides)" msgstr "" -#: lib/depends.c:703 +#: lib/depends.c:691 msgid "(db package)" msgstr "" -#: lib/depends.c:751 +#: lib/depends.c:730 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "NO " msgstr "" -#: lib/depends.c:753 lib/rpmds.c:230 lib/rpmds.c:384 +#: lib/depends.c:732 lib/rpmds.c:231 lib/rpmds.c:385 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1076 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1350 +#: lib/depends.c:1323 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1424 +#: lib/depends.c:1397 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1499 +#: lib/depends.c:1472 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1560 +#: lib/depends.c:1533 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1595 +#: lib/depends.c:1568 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1600 +#: lib/depends.c:1573 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1598,7 +1598,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:952 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2105,173 +2105,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:222 +#: lib/problems.c:225 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:225 +#: lib/problems.c:228 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:265 +#: lib/problems.c:268 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:270 +#: lib/problems.c:273 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:275 +#: lib/problems.c:278 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:280 +#: lib/problems.c:283 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:285 +#: lib/problems.c:288 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:293 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:295 +#: lib/problems.c:298 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:300 +#: lib/problems.c:303 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:310 +#: lib/problems.c:313 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:315 +#: lib/problems.c:318 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:322 +#: lib/problems.c:325 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:268 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:275 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:345 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:411 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:421 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:500 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1149 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1155 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1195 +#: lib/psm.c:1198 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1318 +#: lib/psm.c:1321 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1428 +#: lib/psm.c:1431 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1596 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1603 +#: lib/psm.c:1606 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1945 +#: lib/psm.c:1948 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2062 +#: lib/psm.c:2065 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2176 +#: lib/psm.c:2179 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2185 +#: lib/psm.c:2188 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2226 +#: lib/psm.c:2229 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2227 +#: lib/psm.c:2230 msgid " on file " msgstr "" -#: lib/psm.c:2413 +#: lib/psm.c:2416 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2416 +#: lib/psm.c:2419 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2398,12 +2398,16 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:728 +#: lib/rpmal.c:800 #, c-format msgid "%9s: %-45s YES (added files)\n" msgstr "" -#: lib/rpmal.c:826 +#: lib/rpmal.c:803 +msgid "(added files)" +msgstr "" + +#: lib/rpmal.c:907 msgid "(added provide)" msgstr "" @@ -2471,20 +2475,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:354 +#: lib/rpmds.c:355 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:383 +#: lib/rpmds.c:384 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:409 +#: lib/rpmds.c:410 #, c-format msgid "package %s-%s-%s has unsatisfied %s: %s\n" msgstr "" @@ -2813,13 +2817,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:243 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:882 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/python/rpmmodule.c b/python/rpmmodule.c index 653db8b..3d81630 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -1362,8 +1362,8 @@ static PyObject * rpmtransDepCheck(rpmtransObject * s, PyObject * args) { conflicts[i].needsVersion, conflicts[i].needsFlags, - conflicts[i].suggestedPackages ? - conflicts[i].suggestedPackages[0] : Py_None, + conflicts[i].suggestedPkgs ? + conflicts[i].suggestedPkgs[0] : Py_None, conflicts[i].sense); PyList_Append(list, (PyObject *) cf); Py_DECREF(cf); diff --git a/rpm.spec b/rpm.spec index 8eb9c9a..690095d 100644 --- a/rpm.spec +++ b/rpm.spec @@ -556,3 +556,4 @@ fi - rpmds: create dsProblem(), dsiGetDNEVR() retrieved DNEVR, not N. - depends.h: hack around teIterator() et al from include for now. - rpmds: move trigger dependencies into a rpmDepSet as well. +- rpmal: availablePackage is totally opaque, alKey with index replaces. diff --git a/rpm.spec.in b/rpm.spec.in index 7cab290..7d80e53 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -556,3 +556,4 @@ fi - rpmds: create dsProblem(), dsiGetDNEVR() retrieved DNEVR, not N. - depends.h: hack around teIterator() et al from include for now. - rpmds: move trigger dependencies into a rpmDepSet as well. +- rpmal: availablePackage is totally opaque, alKey with index replaces. -- 2.7.4