From 86fee1906066b9bac00449acdce05f845a0c89db Mon Sep 17 00:00:00 2001 From: jbj Date: Fri, 2 Nov 2001 03:13:35 +0000 Subject: [PATCH] - invent some toy transactionElement iterators. CVS patchset: 5148 CVS date: 2001/11/02 03:13:35 --- CHANGES | 1 + lib/depends.c | 296 +++++++++++++++++------------------------------------ lib/depends.h | 86 +++++++++++++++- lib/transaction.c | 134 +++++++----------------- po/cs.po | 50 ++++----- po/da.po | 50 ++++----- po/de.po | 50 ++++----- po/en_RN.po | 50 ++++----- po/es.po | 50 ++++----- po/eu_ES.po | 50 ++++----- po/fi.po | 50 ++++----- po/fr.po | 50 ++++----- po/gl.po | 50 ++++----- po/hu.po | 50 ++++----- po/id.po | 50 ++++----- po/is.po | 50 ++++----- po/it.po | 50 ++++----- po/ja.po | 50 ++++----- po/ko.po | 50 ++++----- po/no.po | 50 ++++----- po/pl.po | 50 ++++----- po/pt.po | 50 ++++----- po/pt_BR.po | 50 ++++----- po/ro.po | 50 ++++----- po/rpm.pot | 50 ++++----- po/ru.po | 50 ++++----- po/sk.po | 50 ++++----- po/sl.po | 52 +++++----- po/sr.po | 50 ++++----- po/sv.po | 50 ++++----- po/tr.po | 50 ++++----- po/uk.po | 50 ++++----- po/wa.po | 50 ++++----- po/zh.po | 50 ++++----- po/zh_CN.GB2312.po | 50 ++++----- rpm.spec | 1 + rpm.spec.in | 1 + 37 files changed, 994 insertions(+), 1077 deletions(-) diff --git a/CHANGES b/CHANGES index 76d5383..63ab907 100644 --- a/CHANGES +++ b/CHANGES @@ -36,6 +36,7 @@ - transaction.c: cleanly uncouple availablePackage from TFI_t. - add header refcount annotations throughout. - depends.c: availablePackage is (almost) opaque. + - invent some toy transactionElement iterators. 4.0.3 -> 4.0.4: diff --git a/lib/depends.c b/lib/depends.c index 005f23d..f1fb6b1 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -508,6 +508,24 @@ char * hGetNVR(Header h, const char ** np ) return NVR; } +/** + * Return next transaction element of type. + * @param tei transaction element iterator + * @return next transaction element of type, NULL on termination + */ +static /*@dependent@*/ +transactionElement teNext(teIterator tei, enum rpmTransactionType type) + /*@modifies tei @*/ +{ + transactionElement p; + + while ((p = teNextIterator(tei)) != NULL) { + if (p->type == type) + break; + } + return p; +} + int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd, const void * key, int upgrade, rpmRelocation * relocs) { @@ -519,11 +537,7 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd, rpmTagType ont, ovt; int duplicate = 0; int apx; /* addedPackages index */ -#ifdef DYING - availablePackage p; -#else transactionElement p; -#endif rpmDepSet obsoletes = memset(alloca(sizeof(*obsoletes)), 0, sizeof(*obsoletes)); int alNum; int xx; @@ -553,20 +567,6 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd, apx++; -#ifdef DYING - if ((p = alGetPkg(ts->addedPackages, te->u.addedIndex)) == NULL) - break; - - /*@-type@*/ /* FIX: availablePackage excision */ - if (strcmp(p->name, name)) - continue; - /*@=type@*/ - pkgNVR = alGetNVR(ts->addedPackages, te->u.addedIndex); - if (pkgNVR == NULL) /* XXX can't happen */ - continue; - - ph = alGetHeader(ts->addedPackages, te->u.addedIndex, 0); -#else ph = alGetHeader(ts->addedPackages, p->u.addedIndex, 0); if (ph == NULL) break; @@ -581,7 +581,6 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd, continue; } -#endif rc = rpmVersionCompare(ph, h); ph = headerFree(ph, "alGetHeader match"); @@ -609,18 +608,6 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd, ts->orderAlloced += ts->delta; ts->order = xrealloc(ts->order, ts->orderAlloced * sizeof(*ts->order)); } - -#ifdef DYING - { availablePackage this = - alAddPackage(ts->addedPackages, i, h, key, fd, relocs); - alNum = alGetPkgIndex(ts->addedPackages, this); - ts->order[i].u.addedIndex = alNum; - } - - /* XXX sanity check */ - if (alGetPkg(ts->addedPackages, alNum) == NULL) - goto exit; -#else alNum = alAddPackage(ts->addedPackages, apx, h, key, fd, relocs); if (alNum == -1L) { ec = 1; @@ -630,7 +617,6 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd, memset(p, 0, sizeof(*p)); assert(alNum == apx); p->u.addedIndex = alNum; -#endif p->type = TR_ADDED; p->multiLib = 0; @@ -695,13 +681,6 @@ assert(apx == ts->numAddedPackages); if (oldmultiLibMask && multiLibMask && !(oldmultiLibMask & multiLibMask)) { -#ifdef DYING - /*@-type@*/ /* FIX: availablePackage excision */ - availablePackage alp = alGetPkg(ts->addedPackages, alNum); - if (alp != NULL) - alp->multiLib = multiLibMask; - /*@=type@*/ -#endif p->multiLib = multiLibMask; } } @@ -759,13 +738,8 @@ exit: void rpmtransAvailablePackage(rpmTransactionSet ts, Header h, const void * key) { -#ifdef DYING - availablePackage al; - al = alAddPackage(ts->availablePackages, -1, h, key, NULL, NULL); -#else /* XXX FIXME: return code -1L is error */ (void) alAddPackage(ts->availablePackages, -1, h, key, NULL, NULL); -#endif } int rpmtransRemovePackage(rpmTransactionSet ts, int dboffset) @@ -1107,17 +1081,10 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp, {}; pp->suggestedPackages = xmalloc( (j + 1) * sizeof(*pp->suggestedPackages) ); -#ifdef DYING - /*@-type@*/ /* FIX: availablePackage excision */ - for (j = 0; suggestion[j] != NULL; j++) - pp->suggestedPackages[j] = suggestion[j]->key; - /*@=type@*/ -#else for (j = 0; suggestion[j] != NULL; j++) pp->suggestedPackages[j] = alGetKey(ts->availablePackages, alGetPkgIndex(ts->availablePackages, suggestion[j])); -#endif pp->suggestedPackages[j] = NULL; } else { pp->suggestedPackages = NULL; @@ -1464,12 +1431,12 @@ if (_te_debug) { * @param j relation index * @return 0 always */ -static inline int addRelation(const rpmTransactionSet ts, +static inline int addRelation(rpmTransactionSet ts, transactionElement p, unsigned char * selected, rpmDepSet requires) - /*@modifies p, *selected @*/ + /*@modifies ts, p, *selected @*/ { - transactionElement q; + teIterator qi; transactionElement q; tsortInfo tsi; long matchNum; int i = 0; @@ -1487,13 +1454,14 @@ fprintf(stderr, "addRelation: matchNum %d\n", (int)matchNum); if (matchNum == -1L) return 0; -/* XXX set q to the added package that has matchNum == q->u.addedIndex */ +/* XXX Set q to the added package that has matchNum == q->u.addedIndex */ /* XXX FIXME: bsearch is possible/needed here */ - if ((q = ts->order) != NULL) - for (i = 0; i < ts->orderCount; i++, q++) { - if (q->type == TR_ADDED && matchNum == q->u.addedIndex) + qi = teInitIterator(ts); + while ((q = teNext(qi, TR_ADDED)) != NULL) { + if (matchNum == q->u.addedIndex) break; } + qi = teFreeIterator(qi); /*@-modfilesystem -nullpass -nullderef@*/ if (_te_debug) fprintf(stderr, "addRelation: q %p(%s) from %p[%d:%d]\n", q, q->name, ts->order, i, ts->orderCount); @@ -1517,6 +1485,7 @@ fprintf(stderr, "addRelation: requires[%d] %s\n", requires->i, requires->N[requi /* Avoid redundant relations. */ /* XXX TODO: add control bit. */ i = q - ts->order; + if (selected[i] != 0) return 0; selected[i] = 1; @@ -1613,9 +1582,9 @@ int rpmdepOrder(rpmTransactionSet ts) { int numAddedPackages = alGetSize(ts->addedPackages); int chainsaw = ts->transFlags & RPMTRANS_FLAG_CHAINSAW; - transactionElement p; - transactionElement q; - transactionElement r; + teIterator pi; transactionElement p; + teIterator qi; transactionElement q; + teIterator ri; transactionElement r; tsortInfo tsi; tsortInfo tsi_next; int * ordering = alloca(sizeof(*ordering) * (numAddedPackages + 1)); @@ -1641,29 +1610,9 @@ fprintf(stderr, "*** rpmdepOrder(%p) order %p[%d]\n", ts, ts->order, ts->orderCo /* T1. Initialize. */ loopcheck = numAddedPackages; /* XXX TR_ADDED only: should be ts->orderCount */ - if ((p = ts->order) != NULL) - for (i = 0; i < ts->orderCount; i++, p++) { - -#ifdef DYING - /* Initialize tsortInfo. */ - memset(&p->tsi, 0, sizeof(p->tsi)); - p->npreds = 0; - p->depth = 0; - p->NEVR = NULL; - p->name = NULL; - p->version = NULL; - p->release = NULL; -#endif - - /* XXX Only added packages are ordered (for now). */ - switch (p->type) { - case TR_ADDED: - /*@switchbreak@*/ break; - case TR_REMOVED: - default: - continue; - /*@notreached@*/ /*@switchbreak@*/ break; - } + pi = teInitIterator(ts); + /* XXX Only added packages are ordered (for now). */ + while ((p = teNext(pi, TR_ADDED)) != NULL) { /* Retrieve info from addedPackages. */ p->NEVR = alGetNVR(ts->addedPackages, p->u.addedIndex); @@ -1678,23 +1627,15 @@ prtTSI(p->NEVR, &p->tsi); /*@=modfilesystem@*/ /*@=nullpass@*/ } + pi = teFreeIterator(pi); /* Record all relations. */ rpmMessage(RPMMESS_DEBUG, _("========== recording tsort relations\n")); - if ((p = ts->order) != NULL) - for (i = 0; i < ts->orderCount; i++, p++) { + pi = teInitIterator(ts); + /* XXX Only added packages are ordered (for now). */ + while ((p = teNext(pi, TR_ADDED)) != NULL) { rpmDepSet requires; - /* XXX Only added packages are ordered (for now). */ - switch (p->type) { - case TR_ADDED: - /*@switchbreak@*/ break; - case TR_REMOVED: - default: - continue; - /*@notreached@*/ /*@switchbreak@*/ break; - } - requires = alGetRequires(ts->addedPackages, p->u.addedIndex); if (requires->Count <= 0) @@ -1704,13 +1645,13 @@ prtTSI(p->NEVR, &p->tsi); /*@-modfilesystem -nullpass@*/ if (_te_debug) -fprintf(stderr, "\t+++ %p[%d] %s %s-%s-%s requires[%d] %p[%d] Flags %p\n", p, i, p->NEVR, p->name, p->version, p->release, p->u.addedIndex, requires, requires->Count, requires->Flags); +fprintf(stderr, "\t+++ %p[%d] %s %s-%s-%s requires[%d] %p[%d] Flags %p\n", p, teGetOc(pi), p->NEVR, p->name, p->version, p->release, p->u.addedIndex, requires, requires->Count, requires->Flags); /*@=modfilesystem =nullpass@*/ memset(selected, 0, sizeof(*selected) * ts->orderCount); /* Avoid narcisstic relations. */ - selected[i] = 1; + selected[teGetOc(pi)] = 1; /* T2. Next "q <- p" relation. */ @@ -1744,50 +1685,36 @@ fprintf(stderr, "\t+++ %p[%d] %s %s-%s-%s requires[%d] %p[%d] Flags %p\n", p, i, } } + pi = teFreeIterator(pi); /* Save predecessor count. */ - if ((p = ts->order) != NULL) - for (i = 0; i < ts->orderCount; i++, p++) { - /* XXX Only added packages are ordered (for now). */ - switch (p->type) { - case TR_ADDED: - /*@switchbreak@*/ break; - case TR_REMOVED: - default: - continue; - /*@notreached@*/ /*@switchbreak@*/ break; - } + pi = teInitIterator(ts); + /* XXX Only added packages are ordered (for now). */ + while ((p = teNext(pi, TR_ADDED)) != NULL) { p->npreds = p->tsi.tsi_count; /*@-modfilesystem -nullpass@*/ if (_te_debug) -fprintf(stderr, "\t+++ %p[%d] %s npreds %d\n", p, i, p->NEVR, p->npreds); +fprintf(stderr, "\t+++ %p[%d] %s npreds %d\n", p, teGetOc(pi), p->NEVR, p->npreds); /*@=modfilesystem =nullpass@*/ } + pi = teFreeIterator(pi); /* T4. Scan for zeroes. */ rpmMessage(RPMMESS_DEBUG, _("========== tsorting packages (order, #predecessors, #succesors, depth)\n")); rescan: + if (pi) pi = teFreeIterator(pi); q = r = NULL; qlen = 0; - if ((p = ts->order) != NULL) - for (i = 0; i < ts->orderCount; i++, p++) { - - /* XXX Only added packages are ordered (for now). */ - switch (p->type) { - case TR_ADDED: - /*@switchbreak@*/ break; - case TR_REMOVED: - default: - continue; - /*@notreached@*/ /*@switchbreak@*/ break; - } + pi = teInitIterator(ts); + /* XXX Only added packages are ordered (for now). */ + while ((p = teNext(pi, TR_ADDED)) != NULL) { - /* Prefer packages in presentation order. */ + /* Prefer packages in chainsaw or presentation order. */ if (!chainsaw) - p->tsi.tsi_qcnt = (ts->orderCount - i); + p->tsi.tsi_qcnt = (ts->orderCount - teGetOc(pi)); if (p->tsi.tsi_count != 0) continue; @@ -1800,6 +1727,7 @@ fprintf(stderr, "\t+++ addQ ++ qlen %d p %p(%s)", qlen, p, p->NEVR); prtTSI(" p", &p->tsi); /*@=modfilesystem =nullpass@*/ } + pi = teFreeIterator(pi); /* T5. Output front of queue (T7. Remove from queue.) */ /*@-branchstate@*/ /* FIX: r->tsi.tsi_next released */ @@ -1860,63 +1788,37 @@ prtTSI(" p", &p->tsi); /* T9. Initialize predecessor chain. */ nzaps = 0; - if ((q = ts->order) != NULL) - for (i = 0; i < ts->orderCount; i++, q++) { - - /* XXX Only added packages are ordered (for now). */ - switch (q->type) { - case TR_ADDED: - /*@switchbreak@*/ break; - case TR_REMOVED: - default: - continue; - /*@notreached@*/ /*@switchbreak@*/ break; - } - + qi = teInitIterator(ts); + /* XXX Only added packages are ordered (for now). */ + while ((q = teNext(qi, TR_ADDED)) != NULL) { q->tsi.tsi_chain = NULL; q->tsi.tsi_reqx = 0; /* Mark packages already sorted. */ if (q->tsi.tsi_count == 0) q->tsi.tsi_count = -1; } + qi = teFreeIterator(qi); /* T10. Mark all packages with their predecessors. */ - if ((q = ts->order) != NULL) - for (i = 0; i < ts->orderCount; i++, q++) { - - /* XXX Only added packages are ordered (for now). */ - switch (q->type) { - case TR_ADDED: - /*@switchbreak@*/ break; - case TR_REMOVED: - default: - continue; - /*@notreached@*/ /*@switchbreak@*/ break; - } - + qi = teInitIterator(ts); + /* XXX Only added packages are ordered (for now). */ + while ((q = teNext(qi, TR_ADDED)) != NULL) { if ((tsi = q->tsi.tsi_next) == NULL) continue; q->tsi.tsi_next = NULL; markLoop(tsi, q); q->tsi.tsi_next = tsi; } + qi = teFreeIterator(qi); /* T11. Print all dependency loops. */ + ri = teInitIterator(ts); + /* XXX Only added packages are ordered (for now). */ + while ((r = teNext(ri, TR_ADDED)) != NULL) /*@-branchstate@*/ - if ((r = ts->order) != NULL) - for (i = 0; i < ts->orderCount; i++, r++) { + { int printed; - /* XXX Only added packages are ordered (for now). */ - switch (r->type) { - case TR_ADDED: - /*@switchbreak@*/ break; - case TR_REMOVED: - default: - continue; - /*@notreached@*/ /*@switchbreak@*/ break; - } - printed = 0; /* T12. Mark predecessor chain, looking for start of loop. */ @@ -1965,6 +1867,7 @@ prtTSI(" p", &p->tsi); } } /*@=branchstate@*/ + ri = teFreeIterator(ri); /* If a relation was eliminated, then continue sorting. */ /* XXX TODO: add control bit. */ @@ -1987,18 +1890,9 @@ prtTSI(" p", &p->tsi); */ orderList = xcalloc(numAddedPackages, sizeof(*orderList)); j = 0; - if ((p = ts->order) != NULL) - for (i = 0, j = 0; i < ts->orderCount; i++, p++) { - - /* XXX Only added packages are ordered (for now). */ - switch (p->type) { - case TR_ADDED: - /*@switchbreak@*/ break; - case TR_REMOVED: - default: - continue; - /*@notreached@*/ /*@switchbreak@*/ break; - } + pi = teInitIterator(ts); + /* XXX Only added packages are ordered (for now). */ + while ((p = teNext(pi, TR_ADDED)) != NULL) { /* Clean up tsort remnants (if any). */ while ((tsi = p->tsi.tsi_next) != NULL) { @@ -2011,15 +1905,17 @@ prtTSI(" p", &p->tsi); /* Prepare added package ordering permutation. */ orderList[j].alIndex = p->u.addedIndex; - orderList[j].orIndex = i; + orderList[j].orIndex = teGetOc(pi); j++; } + pi = teFreeIterator(pi); assert(j <= numAddedPackages); qsort(orderList, numAddedPackages, sizeof(*orderList), orderListIndexCmp); newOrder = xcalloc(ts->orderCount, sizeof(*newOrder)); - for (i = 0, newOrderCount = 0; i < orderingCount; i++) { + for (i = 0, newOrderCount = 0; i < orderingCount; i++) + { struct orderListIndex_s key; orderListIndex needle; @@ -2029,28 +1925,35 @@ prtTSI(" p", &p->tsi); /* bsearch should never, ever fail */ if (needle == NULL) continue; + j = needle->orIndex; /*@-assignexpose@*/ - newOrder[newOrderCount++] = ts->order[needle->orIndex]; + q = ts->order + j; + newOrder[newOrderCount++] = *q; /* structure assignment */ /*@=assignexpose@*/ for (j = needle->orIndex + 1; j < ts->orderCount; j++) { - if (ts->order[j].type == TR_REMOVED && - ts->order[j].u.removed.dependsOnIndex == needle->alIndex) { + q = ts->order + j; + if (q->type == TR_REMOVED && + q->u.removed.dependsOnIndex == needle->alIndex) { /*@-assignexpose@*/ - newOrder[newOrderCount++] = ts->order[j]; + newOrder[newOrderCount++] = *q; /* structure assignment */ /*@=assignexpose@*/ } else /*@innerbreak@*/ break; } } - for (i = 0; i < ts->orderCount; i++) { - if (ts->order[i].type == TR_REMOVED && - ts->order[i].u.removed.dependsOnIndex == -1) { + /*@-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) { /*@-assignexpose@*/ - newOrder[newOrderCount++] = ts->order[i]; + newOrder[newOrderCount] = *p; /* structure assignment */ /*@=assignexpose@*/ + newOrderCount++; } } + pi = teFreeIterator(pi); assert(newOrderCount == ts->orderCount); ts->order = _free(ts->order); @@ -2101,12 +2004,9 @@ int rpmdepCheck(rpmTransactionSet ts, rpmdbMatchIterator mi = NULL; Header h = NULL; problemsSet ps = NULL; - transactionElement p; -#ifdef DYING - int numAddedPackages; -#endif + teIterator pi = NULL; transactionElement p; int closeatexit = 0; - int i, j, xx; + int j, xx; int rc; /* Do lazy, readonly, open of rpm database. */ @@ -2116,10 +2016,6 @@ int rpmdepCheck(rpmTransactionSet ts, closeatexit = 1; } -#ifdef DYING - numAddedPackages = alGetSize(ts->addedPackages); -#endif - ps = xcalloc(1, sizeof(*ps)); ps->alloced = 5; ps->num = 0; @@ -2135,8 +2031,9 @@ int rpmdepCheck(rpmTransactionSet ts, * Look at all of the added packages and make sure their dependencies * are satisfied. */ - if ((p = ts->order) != NULL) - for (i = 0; i < ts->orderCount; i++, p++) { + pi = teInitIterator(ts); + /* XXX Only added packages are checked (for now). */ + while ((p = teNext(pi, TR_ADDED)) != NULL) { char * pkgNVR = NULL, * n, * v, * r; rpmDepSet provides; uint_32 multiLib; @@ -2151,12 +2048,6 @@ int rpmdepCheck(rpmTransactionSet ts, /*@notreached@*/ /*@switchbreak@*/ break; } -#ifdef DYING - pkgNVR = alGetNVR(ts->addedPackages, p->u.addedIndex); - if (pkgNVR == NULL) /* XXX can't happen */ - break; - multiLib = alGetMultiLib(ts->addedPackages, p->u.addedIndex); -#else h = alGetHeader(ts->addedPackages, p->u.addedIndex, 0); if (h == NULL) /* XXX can't happen */ break; @@ -2164,7 +2055,6 @@ int rpmdepCheck(rpmTransactionSet ts, pkgNVR = _free(pkgNVR); pkgNVR = hGetNVR(h, NULL); multiLib = p->multiLib; -#endif rpmMessage(RPMMESS_DEBUG, "========== +++ %s\n" , pkgNVR); rc = checkPackageDeps(ts, ps, h, NULL, multiLib); @@ -2203,6 +2093,7 @@ int rpmdepCheck(rpmTransactionSet ts, if (rc) goto exit; } + pi = teFreeIterator(pi); /* * Look at the removed packages and make sure they aren't critical. @@ -2299,6 +2190,7 @@ int rpmdepCheck(rpmTransactionSet ts, exit: mi = rpmdbFreeIterator(mi); + pi = teFreeIterator(pi); if (ps) { ps->problems = _free(ps->problems); ps = _free(ps); diff --git a/lib/depends.h b/lib/depends.h index c103b3b..d768551 100644 --- a/lib/depends.h +++ b/lib/depends.h @@ -12,6 +12,7 @@ typedef /*@abstract@*/ struct tsortInfo_s * tsortInfo; typedef /*@abstract@*/ struct orderListIndex_s * orderListIndex; typedef /*@abstract@*/ struct transactionElement_s * transactionElement; +typedef /*@abstract@*/ struct teIterator_s * teIterator; typedef /*@abstract@*/ struct availableList_s * availableList; typedef /*@abstract@*/ struct problemsSet_s * problemsSet; @@ -21,6 +22,16 @@ typedef /*@abstract@*/ struct problemsSet_s * problemsSet; extern int _ts_debug; /*@=exportlocal@*/ +/** + * Iterator across transaction elements, forward on install, backward on erase. + */ +struct teIterator_s { +/*@refcounted@*/ rpmTransactionSet ts; /*!< transaction set. */ + int reverse; /*!< reversed traversal? */ + int ocsave; /*!< last returned iterator index. */ + int oc; /*!< iterator index. */ +}; + /** \ingroup rpmdep * Dependncy ordering information. */ @@ -137,7 +148,7 @@ struct rpmTransactionSet_s { /*!< Universe of available packages. */ int numAvailablePackages; /*!< No. available package instances. */ -/*@only@*/ +/*@owned@*/ transactionElement order; /*!< Packages sorted by dependencies. */ int orderCount; /*!< No. of transaction elements. */ int orderAlloced; /*!< No. of allocated transaction elements. */ @@ -180,6 +191,79 @@ struct problemsSet_s { extern "C" { #endif +/*@access teIterator@*/ +/*@access rpmTransactionSet@*/ + +/** + * Return transaction element index. + * @param tei transaction element iterator + * @return element index + */ +/*@unused@*/ static inline +int teGetOc(teIterator tei) + /*@*/ +{ + return tei->ocsave; +} + +/** + * Destroy transaction element iterator. + * @param tei transaction element iterator + * @return NULL always + */ +/*@unused@*/ static inline /*@null@*/ +teIterator teFreeIterator(/*@only@*//*@null@*/ teIterator tei) + /*@*/ +{ + if (tei) + tei->ts = rpmtsUnlink(tei->ts, "tsIterator"); + return _free(tei); +} + +/** + * Create transaction element iterator. + * @param ts transaction set + * @return transaction element iterator + */ +/*@unused@*/ static inline /*@only@*/ +teIterator teInitIterator(rpmTransactionSet ts) + /*@modifies ts @*/ +{ + teIterator tei = NULL; + + tei = xcalloc(1, sizeof(*tei)); + tei->ts = rpmtsLink(ts, "teIterator"); + tei->reverse = ((ts->transFlags & RPMTRANS_FLAG_REVERSE) ? 1 : 0); + tei->oc = (tei->reverse ? (ts->orderCount - 1) : 0); + tei->ocsave = tei->oc; + return tei; +} + +/** + * Return next transaction element + * @param tei transaction element iterator + * @return transaction element, NULL on termination + */ +/*@unused@*/ static inline /*@dependent@*/ +transactionElement teNextIterator(teIterator tei) + /*@modifies tei @*/ +{ + transactionElement te = NULL; + int oc = -1; + + if (tei->reverse) { + if (tei->oc >= 0) oc = tei->oc--; + } else { + if (tei->oc < tei->ts->orderCount) oc = tei->oc++; + } + tei->ocsave = oc; + if (oc != -1) + te = tei->ts->order + oc; + /*@-compdef -usereleased@*/ /* FIX: ts->order may be released */ + return te; + /*@=compdef =usereleased@*/ +} + /** * Return (malloc'd) header name-version-release string. * @param h header diff --git a/lib/transaction.c b/lib/transaction.c index 8dcf757..da30f13 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -52,15 +52,13 @@ extern int statvfs (const char * file, /*@out@*/ struct statvfs * buf) /*@access rpmProblemSet@*/ /* XXX need rpmProblemSetOK() */ /*@access dbiIndexSet@*/ /*@access rpmdb@*/ -/*@access rpmTransactionSet@*/ -/*@access TFI_t@*/ -/*@access PSM_t@*/ -#if 0 -/*@access availablePackage@*/ -#endif +/*@access PSM_t@*/ +/*@access TFI_t@*/ +/*@access teIterator@*/ /*@access transactionElement@*/ +/*@access rpmTransactionSet@*/ /** */ @@ -891,81 +889,21 @@ static void skipFiles(const rpmTransactionSet ts, TFI_t fi) } /** - * Iterator across transaction elements, forward on install, backward on erase. - */ -struct tsIterator_s { -/*@refcounted@*/ rpmTransactionSet ts; /*!< transaction set. */ - int reverse; /*!< reversed traversal? */ - int ocsave; /*!< last returned iterator index. */ - int oc; /*!< iterator index. */ -}; - -/** - * Return transaction element order count. - * @param a transaction element iterator - * @return element order count - */ -static int tsGetOc(void * a) - /*@*/ -{ - struct tsIterator_s * iter = a; - int oc = iter->ocsave; - return oc; -} - -/** - * Destroy transaction element iterator. - * @param a transaction element iterator - * @return NULL always - */ -static /*@null@*/ void * tsFreeIterator(/*@only@*//*@null@*/ void * a) - /*@*/ -{ - struct tsIterator_s * iter = a; - if (iter) - iter->ts = rpmtsUnlink(iter->ts, "tsIterator"); - return _free(a); -} - -/** - * Create transaction element iterator. - * @param ts transaction set - * @return transaction element iterator - */ -static void * tsInitIterator(rpmTransactionSet ts) - /*@modifies ts @*/ -{ - struct tsIterator_s * iter = NULL; - - iter = xcalloc(1, sizeof(*iter)); - iter->ts = rpmtsLink(ts, "tsIterator"); - iter->reverse = ((ts->transFlags & RPMTRANS_FLAG_REVERSE) ? 1 : 0); - iter->oc = (iter->reverse ? (ts->orderCount - 1) : 0); - iter->ocsave = iter->oc; - return iter; -} - -/** * Return next transaction element's file info. - * @param a file info iterator - * @return next index, -1 on termination + * @param tei transaction element iterator + * @return nest transaction element file info, NULL on termination */ -static TFI_t tsNextIterator(void * a) - /*@*/ +/*@unused@*/ static inline +TFI_t teNextFi(teIterator tei) + /*@modifies tei @*/ { - struct tsIterator_s * iter = a; TFI_t fi = NULL; - int oc = -1; - if (iter->reverse) { - if (iter->oc >= 0) oc = iter->oc--; - } else { - if (iter->oc < iter->ts->orderCount) oc = iter->oc++; - } - iter->ocsave = oc; - if (oc != -1) - fi = iter->ts->flList + oc; + if (teNextIterator(tei) != NULL && tei->ocsave != -1) + fi = tei->ts->flList + tei->ocsave; + /*@-compdef -onlytrans -usereleased@*/ /* FIX: ts->flList may be released */ return fi; + /*@=compdef =onlytrans =usereleased@*/ } #define NOTIFY(_ts, _al) if ((_ts)->notify) (void) (_ts)->notify _al @@ -988,7 +926,7 @@ int rpmRunTransactions( rpmTransactionSet ts, fingerPrintCache fpc; struct psm_s psmbuf; PSM_t psm = &psmbuf; - void * tsi; + teIterator tei; int xx; int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ @@ -1168,9 +1106,9 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ * calling fpLookupList only once. I'm not sure that the speedup is * worth the trouble though. */ - tsi = tsInitIterator(ts); - while ((fi = tsNextIterator(tsi)) != NULL) { - oc = tsGetOc(tsi); + tei = teInitIterator(ts); + while ((fi = teNextFi(tei)) != NULL) { + oc = teGetOc(tei); fi->magic = TFIMAGIC; fi->type = ts->order[oc].type; @@ -1229,7 +1167,7 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ if (fi->fc) fi->fps = xmalloc(fi->fc * sizeof(*fi->fps)); } - tsi = tsFreeIterator(tsi); + tei = teFreeIterator(tei); if (!ts->chrootDone) { xx = chdir("/"); @@ -1251,8 +1189,8 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ /* =============================================== * Add fingerprint for each file not skipped. */ - tsi = tsInitIterator(ts); - while ((fi = tsNextIterator(tsi)) != NULL) { + tei = teInitIterator(ts); + while ((fi = teNextFi(tei)) != NULL) { fpLookupList(fpc, fi->dnl, fi->bnl, fi->dil, fi->fc, fi->fps); for (i = 0; i < fi->fc; i++) { if (XFA_SKIPPING(fi->actions[i])) @@ -1262,7 +1200,7 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ /*@=dependenttrans@*/ } } - tsi = tsFreeIterator(tsi); + tei = teFreeIterator(tei); /*@-noeffectuncon @*/ /* FIX: check rc */ NOTIFY(ts, (NULL, RPMCALLBACK_TRANS_START, 6, ts->flEntries, @@ -1272,8 +1210,8 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ /* =============================================== * Compute file disposition for each package in transaction set. */ - tsi = tsInitIterator(ts); - while ((fi = tsNextIterator(tsi)) != NULL) { + tei = teInitIterator(ts); + while ((fi = teNextFi(tei)) != NULL) { dbiIndexSet * matches; int knownBad; @@ -1401,7 +1339,7 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ /*@switchbreak@*/ break; } } - tsi = tsFreeIterator(tsi); + tei = teFreeIterator(tei); if (ts->chrootDone) { /*@-superuser -noeffect @*/ @@ -1424,13 +1362,13 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ * Free unused memory as soon as possible. */ - tsi = tsInitIterator(ts); - while ((fi = tsNextIterator(tsi)) != NULL) { + tei = teInitIterator(ts); + while ((fi = teNextFi(tei)) != NULL) { if (fi->fc == 0) continue; fi->fps = _free(fi->fps); } - tsi = tsFreeIterator(tsi); + tei = teFreeIterator(tei); fpCacheFree(fpc); htFree(ts->ht); @@ -1459,8 +1397,8 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ * Save removed files before erasing. */ if (ts->transFlags & (RPMTRANS_FLAG_DIRSTASH | RPMTRANS_FLAG_REPACKAGE)) { - tsi = tsInitIterator(ts); - while ((fi = tsNextIterator(tsi)) != NULL) { + tei = teInitIterator(ts); + while ((fi = teNextFi(tei)) != NULL) { switch (fi->type) { case TR_ADDED: /*@switchbreak@*/ break; @@ -1474,7 +1412,7 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ /*@switchbreak@*/ break; } } - tsi = tsFreeIterator(tsi); + tei = teFreeIterator(tei); } /* =============================================== @@ -1482,13 +1420,13 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ */ lastFailed = -2; /* erased packages have -1 */ - tsi = tsInitIterator(ts); + tei = teInitIterator(ts); /*@-branchstate@*/ /* FIX: fi reload needs work */ - while ((fi = tsNextIterator(tsi)) != NULL) { + while ((fi = teNextFi(tei)) != NULL) { Header h; int gotfd; - oc = tsGetOc(tsi); + oc = teGetOc(tei); gotfd = 0; psm->fi = rpmfiLink(fi, "tsInstall"); switch (fi->type) { @@ -1555,7 +1493,7 @@ fi->key = NULL; fi->relocs = NULL; fi->fd = NULL; freeFi(fi); -oc = tsGetOc(tsi); +oc = teGetOc(tei); fi->magic = TFIMAGIC; fi->type = ts->order[oc].type; fi->record = 0; @@ -1603,7 +1541,7 @@ fi->relocs = relocs; case TR_REMOVED: rpmMessage(RPMMESS_DEBUG, "========== --- %s-%s-%s\n", fi->name, fi->version, fi->release); - oc = tsGetOc(tsi); + oc = teGetOc(tei); /* If install failed, then we shouldn't erase. */ if (ts->order[oc].u.removed.dependsOnIndex != lastFailed) { if (psmStage(psm, PSM_PKGERASE)) @@ -1617,7 +1555,7 @@ fi->relocs = relocs; psm->fi = NULL; } /*@=branchstate@*/ - tsi = tsFreeIterator(tsi); + tei = teFreeIterator(tei); ts->flList = freeFl(ts, ts->flList); ts->flEntries = 0; diff --git a/po/cs.po b/po/cs.po index 319dff2..7124cdb 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -1447,11 +1447,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "ANO" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "NE " @@ -1460,57 +1460,57 @@ msgstr "NE " msgid "cannot open Packages database in %s\n" msgstr "nemohu otevøít databázi balíèkù v %s\n" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "balíèek %s je ji¾ nainstalován" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-s (ke¹ováno)\n" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s ANO (rpmrc poskytuje)\n" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s ANO (rpmlib poskytuje)\n" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s ANO (db soubory)\n" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s ANO (db poskytuje)\n" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s ANO (db balíèek)\n" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NE\n" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) pøidáno do ke¹e závislostí.\n" @@ -1518,48 +1518,48 @@ msgstr "%s: (%s, %s) p #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "balíèek %s koliduje: %s\n" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, 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:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "========== ukládání tsort relací\n" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 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:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "SMYÈKA:\n" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "========== pokraèuje tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2869,13 +2869,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Podpisu: velikost(%d)+vata(%d)\n" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, 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:878 #, 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 6dcd881..9c92ce1 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -1448,11 +1448,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 #, fuzzy msgid "NO " msgstr "IKKE O.K." @@ -1462,57 +1462,57 @@ msgstr "IKKE O.K." msgid "cannot open Packages database in %s\n" msgstr "kunne ikke åbne Packages-database i %s\n" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "pakken %s er allerede installeret" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-3s (husket)\n" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s JA (rpmrc tilfører)\n" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s JA (rpmlib tilfører)\n" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s JA (db-filer)\n" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s JA (db tilfører)\n" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s JA (db-pakke)\n" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NEJ\n" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) tilføjet til afhængigheds-buffer.\n" @@ -1520,47 +1520,47 @@ msgstr "%s: (%s, %s) tilf #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "pakke %s skaber konflikt: %s\n" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, 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:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "========== gemmer tsort-relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "LØKKE:\n" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "========== fortsætter tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2891,13 +2891,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signaturfyld : %d\n" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, 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:878 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer kataloget %s\n" diff --git a/po/de.po b/po/de.po index eee05f3..1e48483 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -1581,11 +1581,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "" @@ -1594,57 +1594,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "Paket %s ist nicht installiert\n" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:932 +#: lib/depends.c:906 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:982 +#: lib/depends.c:956 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" @@ -1652,48 +1652,48 @@ msgstr "die Datei #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" # FIXME -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, 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:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -3087,13 +3087,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, 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 c7a373d..c2fc4ea 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,47 +1494,47 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2823,13 +2823,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/es.po b/po/es.po index c7a373d..c2fc4ea 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,47 +1494,47 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2823,13 +2823,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/eu_ES.po b/po/eu_ES.po index c7a373d..c2fc4ea 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,47 +1494,47 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2823,13 +2823,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/fi.po b/po/fi.po index 5019559..d85a7f7 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -1464,11 +1464,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "" @@ -1477,57 +1477,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "virhe: en voi avata %s%s/packages.rpm\n" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:932 +#: lib/depends.c:906 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:982 +#: lib/depends.c:956 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "tiedostoa %s ei omista mikään paketti\n" @@ -1535,47 +1535,47 @@ msgstr "tiedostoa %s ei omista mik #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "paketti %s ei ole %s:ssä" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2938,13 +2938,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, 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 79894a8..9bb59a9 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1504,11 +1504,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "" @@ -1517,57 +1517,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1575,47 +1575,47 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "aucun package n'a t spcifi pour l'installation" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "impossible d'ouvrir: %s\n" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2987,13 +2987,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/gl.po b/po/gl.po index 807e00f..5d3515a 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -1418,11 +1418,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "" @@ -1431,57 +1431,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1489,47 +1489,47 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2818,13 +2818,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/hu.po b/po/hu.po index c7a373d..c2fc4ea 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,47 +1494,47 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2823,13 +2823,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/id.po b/po/id.po index c7a373d..c2fc4ea 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,47 +1494,47 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2823,13 +2823,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/is.po b/po/is.po index 9360e75..8bdce46 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "get ekki opnað pakka gagnagrunn í\n" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,47 +1494,47 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2828,13 +2828,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/it.po b/po/it.po index c7a373d..c2fc4ea 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,47 +1494,47 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2823,13 +2823,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index 457a9a3..06b4362 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -1498,11 +1498,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "" @@ -1511,57 +1511,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %s ¤Ï db ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" -#: lib/depends.c:915 +#: lib/depends.c:889 #, fuzzy, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:932 +#: lib/depends.c:906 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, fuzzy, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:982 +#: lib/depends.c:956 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %s ¤Ï db ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" @@ -1569,47 +1569,47 @@ msgstr "%s: %s #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹: %s\n" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2998,13 +2998,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "½ð̾¥Ñ¥Ã¥É: %d\n" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n" diff --git a/po/ko.po b/po/ko.po index 9ac1162..ba6a44f 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: 2001-09-07 22:03+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -1438,11 +1438,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "¿¹" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "¾Æ´Ï¿À" @@ -1451,57 +1451,57 @@ msgstr " msgid "cannot open Packages database in %s\n" msgstr "%s ¾ÈÀÇ ÆÐÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "%s ÆÐÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-s (ij½ÃµÊ)\n" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s ¿¹ (rpmrcÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s ¿¹ (rpmlibÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s ¿¹ (db ÆÄÀÏ)\n" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s ¿¹ (db ÆÐÅ°Áö)\n" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s ¾Æ´Ï¿À\n" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) ÀÇÁ¸(Depends) ij½Ã¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù.\n" @@ -1509,48 +1509,48 @@ msgstr "%s: (%s, %s) #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "%s-%s-%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "ÆÐÅ°Áö %s (ÀÌ)°¡ Ãæµ¹ÇÔ: %s\n" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort °ü°è¿¡¼­ %s-%s-%s \"%s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== ÆÐÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼­, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, ±íÀÌ[depth])\n" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "========== ÈÄÀÓÀÚ [successors only] (Ç¥Çö ¼ø)\n" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "·çÇÁ(LOOP):\n" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2874,13 +2874,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "¼­¸í: size(%d)+pad(%d)\n" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "missingok Ç÷¡±×·Î ÀÎÇØ %s (À»)¸¦ »ý·«ÇÕ´Ï´Ù\n" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, c-format msgid "excluding directory %s\n" msgstr "%s µð·ºÅ丮¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" diff --git a/po/no.po b/po/no.po index cf01ed8..f84dfa3 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -1437,11 +1437,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "JA" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "NEI" @@ -1450,57 +1450,57 @@ msgstr "NEI" msgid "cannot open Packages database in %s\n" msgstr "kan ikke åpne pakkedatabase i %s\n" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "pakke %s er allerede installert" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1508,47 +1508,47 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "pakke %s er i konflikt: %s\n" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2852,13 +2852,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer katalog %s\n" diff --git a/po/pl.po b/po/pl.po index fbe1863..df29ff7 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -1478,11 +1478,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 #, fuzzy msgid "NO " msgstr "NIE DOBRZE" @@ -1492,57 +1492,57 @@ msgstr "NIE DOBRZE" msgid "cannot open Packages database in %s\n" msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:932 +#: lib/depends.c:906 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:982 +#: lib/depends.c:956 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" @@ -1550,47 +1550,47 @@ msgstr "plik %s nie nale #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "pakiet %s jest w konflikcie: %s\n" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "usuwanie indeksu grupy\n" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2951,13 +2951,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Blok sygnatury: %d\n" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, 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:878 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "tworzenie katalogu: %s\n" diff --git a/po/pt.po b/po/pt.po index 82b1293..e574684 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-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" @@ -1435,11 +1435,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 #, fuzzy msgid "NO " msgstr "NÃO-OK" @@ -1449,57 +1449,57 @@ msgstr "N msgid "cannot open Packages database in %s\n" msgstr "não consigo abrir a base de dados Packages em %s\n" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "o pacote %s já está instalado" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-3s (em cache)\n" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s SIM (oferecidos pelo rpmrc)\n" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s SIM (oferecidos pela rpmlib)\n" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s SIM (ficheiros db)\n" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s SI (oferecidos pelo db)\n" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s SIM (pacote db)\n" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NÃO\n" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) adicionado à cache de dependências.\n" @@ -1507,47 +1507,47 @@ msgstr "%s: (%s, %s) adicionado #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "requisito %s-%s-%s do pacote não satisfeito: %s\n" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "o pacote %s está em conflito: %s\n" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, 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:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "=========== a guardar as relações do tsort\n" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "========== só os sucessores (ordem de apresentação)\n" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "CICLO:\n" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "========== a prosseguir o tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2865,13 +2865,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "'Pad' ou preenchimento da assinatura: %d\n" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, 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:878 #, 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 7242eb1..7f9fc4d 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" #: build.c:36 #, fuzzy @@ -1590,11 +1590,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "" @@ -1604,57 +1604,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "No consegui abrir: %s\n" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "no foi passado pacote para instalao" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1662,48 +1662,48 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "no foi passado pacote para instalao" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "no foi passado pacote para desinstalao" # , c-format -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "No consegui abrir: %s\n" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -3132,7 +3132,7 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3146,7 +3146,7 @@ msgstr "" # "Content-Transfer-Encoding: 8-bit\n" # , c-format #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "RPM verso %s\n" diff --git a/po/ro.po b/po/ro.po index 82daf2e..84a3887 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -1418,11 +1418,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "" @@ -1431,57 +1431,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1489,47 +1489,47 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2818,13 +2818,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index ef1c4cb..2a3d570 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,47 +1494,47 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2823,13 +2823,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 5e7f3ab..ff830ee 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: 2001-08-29 13:55-0400\n" "Last-Translator: Eugene Kanter \n" "Language-Team: Black Cat Linux Team \n" @@ -1456,11 +1456,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "äá" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "îåT" @@ -1469,57 +1469,57 @@ msgstr " msgid "cannot open Packages database in %s\n" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "ÐÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-s (cached)\n" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s YES (rpmrc provides)\n" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s YES (rpmlib provides)\n" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s YES (db files)\n" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s YES (db provides)\n" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s YES (db package)\n" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NO\n" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) ÄÏÂÁ×ÌÅÎÏ × ËÅÛ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" @@ -1527,49 +1527,49 @@ msgstr "%s: (%s, %s) #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "ÐÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó: %s\n" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "========== ÚÁÐÉÓØ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== ÓÏÒÔÉÒÏ×ËÁ ÐÁËÅÔÏ× (ÏÞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, " "ÇÌÕÂÉÎÁ)\n" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "========== ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌÉ (× ÐÏÒÑÄËÅ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ)\n" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "ãéëì:\n" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "========== ÐÒÏÄÏÌÖÅÎÉÅ ÕÐÏÒÑÄÏÞÅÎÉÑ ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2882,13 +2882,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "ðÏÄÐÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁÐÏÌÎÅÎÉÅ(%d)\n" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ÐÒÏÐÕÝÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, c-format msgid "excluding directory %s\n" msgstr "ÉÓËÌÀÞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n" diff --git a/po/sk.po b/po/sk.po index b58c9cc..bde2570 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -1477,11 +1477,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 #, fuzzy msgid "NO " msgstr "NIE JE V PORIADKU" @@ -1491,57 +1491,57 @@ msgstr "NIE JE V PORIADKU" msgid "cannot open Packages database in %s\n" msgstr "nie je mo¾né otvori» %s/packages.rpm\n" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:932 +#: lib/depends.c:906 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:982 +#: lib/depends.c:956 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" @@ -1549,47 +1549,47 @@ msgstr "s #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "balík %s koliduje: %s\n" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, 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:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2948,13 +2948,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Doplnenie podpisu: %d\n" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, 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:878 #, 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 a37ae36..3872825 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.183 2001/11/01 23:18:38 jbj Exp $ +# $Id: sl.po,v 1.184 2001/11/02 03:13:41 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -1480,11 +1480,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 #, fuzzy msgid "NO " msgstr "NI DOBRO" @@ -1494,57 +1494,57 @@ msgstr "NI DOBRO" msgid "cannot open Packages database in %s\n" msgstr "zbirko podatkov paketov ni mo¾no odpreti v %s\n" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paket %s-%s-%s je ¾e name¹èen" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-3s (predpomnjeno)\n" -#: lib/depends.c:915 +#: lib/depends.c:889 #, fuzzy, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s DA (rpmrc ponudbe)\n" -#: lib/depends.c:932 +#: lib/depends.c:906 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s DA (rpmlib ponudbe)\n" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s DA (db datoteke)\n" -#: lib/depends.c:968 +#: lib/depends.c:942 #, fuzzy, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s DA (db ponudbe)\n" -#: lib/depends.c:982 +#: lib/depends.c:956 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %s zadovoljen ob paketih db.\n" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NE\n" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n" @@ -1552,47 +1552,47 @@ msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "paket %s jw v sporu z: %s\n" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstranjujemo seznam skupin\n" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2946,13 +2946,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Dol¾. polnila : %d\n" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, 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:878 #, c-format msgid "excluding directory %s\n" msgstr "izkljuèevanje imenika %s\n" diff --git a/po/sr.po b/po/sr.po index 79b4c5e..5209ac0 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" @@ -1462,11 +1462,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "" @@ -1475,57 +1475,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paket %s nije instaliran\n" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:932 +#: lib/depends.c:906 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:982 +#: lib/depends.c:956 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "datoteka %s ne pripada nijednom paketu\n" @@ -1533,47 +1533,47 @@ msgstr "datoteka %s ne pripada nijednom paketu\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "paket %s nije naveden u %s" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "paket %s nije naveden u %s" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, 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:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2937,13 +2937,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, 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 b7b8156..11e1329 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: 2001-09-12 14:18+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -1441,11 +1441,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "JA" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "NEJ " @@ -1454,57 +1454,57 @@ msgstr "NEJ " msgid "cannot open Packages database in %s\n" msgstr "kan inte öppna paketdatabas i %s\n" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paket %s är redan installerat" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-s (cachad)\n" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s JA (rpmlib tillhandahåller)\n" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s JA (db-filer)\n" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s JA (db-tillhandahållande)\n" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s JA (db-paket)\n" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NEJ\n" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) tillagt till beroendecachen.\n" @@ -1512,48 +1512,48 @@ msgstr "%s: (%s, %s) tillagt till beroendecachen.\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "paket %s står i konflikt: %s\n" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, 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:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "========== noterar alla relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== tsort:erar paket (ordning, #föregångare, #efterföljare, djup)\n" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "========== endast efterföljare (presentationsordning)\n" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "LOOP:\n" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "========== fortsätter med tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2867,13 +2867,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, 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:878 #, c-format msgid "excluding directory %s\n" msgstr "hoppar över katalogen %s\n" diff --git a/po/tr.po b/po/tr.po index 6a9d31b..6432bea 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -1461,11 +1461,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "EVET" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "HAYIR " @@ -1474,57 +1474,57 @@ msgstr "HAYIR " msgid "cannot open Packages database in %s\n" msgstr "%s de Paket veritabaný açýlamadý\n" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "%s zaten kurulu" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-s (arabellekli)\n" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s EVET (rpmrc saðlar)\n" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s EVET (rpmlib saðlar)\n" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s EVET (db dosyalarý)\n" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s EVET (db saðlar)\n" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s EVET (db paketi)\n" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s HAYIR\n" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) Baðýmlýlar alanýna eklendi.\n" @@ -1532,48 +1532,48 @@ msgstr "%s: (%s, %s) Ba #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "paket %s-%s-%s gereksinimi tatmin edici deðil: %s\n" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "%s paketi çeliþiyor: %s\n" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, 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:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "========== tsort baðýntýlarý kaydediliyor\n" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== paketler tsort'lanýyor (sýra, #öncüller, #ardýllar, derinlik)\n" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "========== sadece ardýllar (sunum sýrasý)\n" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "ÇEVRÝM:\n" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "========== tsort sürüyor ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2888,13 +2888,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Ýmza: boyut(%d)+iz(%d)\n" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, 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:878 #, 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 c7a373d..c2fc4ea 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,47 +1494,47 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2823,13 +2823,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/wa.po b/po/wa.po index c7a373d..c2fc4ea 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,47 +1494,47 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2823,13 +2823,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/zh.po b/po/zh.po index c7a373d..c2fc4ea 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,47 +1494,47 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2823,13 +2823,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index c7a373d..c2fc4ea 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-01 17:49-0500\n" +"POT-Creation-Date: 2001-11-01 21:47-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 +#: lib/depends.c:213 lib/depends.c:861 lib/depends.c:993 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:590 +#: lib/depends.c:589 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:595 +#: lib/depends.c:594 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:599 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:886 +#: lib/depends.c:860 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:915 +#: lib/depends.c:889 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:932 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:955 +#: lib/depends.c:929 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:968 +#: lib/depends.c:942 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:982 +#: lib/depends.c:956 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:998 +#: lib/depends.c:972 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1019 +#: lib/depends.c:993 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,47 +1494,47 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1085 +#: lib/depends.c:1059 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1172 +#: lib/depends.c:1139 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1395 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1683 +#: lib/depends.c:1633 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1770 +#: lib/depends.c:1705 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1852 +#: lib/depends.c:1780 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1938 +#: lib/depends.c:1840 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1972 +#: lib/depends.c:1875 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1977 +#: lib/depends.c:1880 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2823,13 +2823,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:241 +#: lib/transaction.c:239 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:880 +#: lib/transaction.c:878 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/rpm.spec b/rpm.spec index 323f9c1..436dbca 100644 --- a/rpm.spec +++ b/rpm.spec @@ -548,3 +548,4 @@ fi - transaction.c: cleanly uncouple availablePackage from TFI_t. - add header refcount annotations throughout. - depends.c: availablePackage is (almost) opaque. +- invent some toy transactionElement iterators. diff --git a/rpm.spec.in b/rpm.spec.in index 678dd73..622e286 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -548,3 +548,4 @@ fi - transaction.c: cleanly uncouple availablePackage from TFI_t. - add header refcount annotations throughout. - depends.c: availablePackage is (almost) opaque. +- invent some toy transactionElement iterators. -- 2.7.4