From b0e16172c3b42c758fd411650a8c2bbbf791a507 Mon Sep 17 00:00:00 2001 From: jbj Date: Thu, 1 Nov 2001 23:18:15 +0000 Subject: [PATCH] - depends.c: availablePackage is (almost) opaque. CVS patchset: 5147 CVS date: 2001/11/01 23:18:15 --- CHANGES | 1 + lib/depends.c | 185 ++++++++++++++++++++++++++++++++++++++------- lib/depends.h | 22 +++++- lib/header.c | 8 +- lib/header.h | 2 +- lib/psm.c | 2 +- lib/rpmal.c | 21 ++++- lib/rpmal.h | 11 ++- lib/transaction.c | 10 ++- po/cs.po | 82 ++++++++++---------- po/da.po | 82 ++++++++++---------- po/de.po | 82 ++++++++++---------- po/en_RN.po | 82 ++++++++++---------- po/es.po | 82 ++++++++++---------- po/eu_ES.po | 82 ++++++++++---------- po/fi.po | 82 ++++++++++---------- po/fr.po | 82 ++++++++++---------- po/gl.po | 82 ++++++++++---------- po/hu.po | 82 ++++++++++---------- po/id.po | 82 ++++++++++---------- po/is.po | 82 ++++++++++---------- po/it.po | 82 ++++++++++---------- po/ja.po | 82 ++++++++++---------- po/ko.po | 82 ++++++++++---------- po/no.po | 82 ++++++++++---------- po/pl.po | 82 ++++++++++---------- po/pt.po | 82 ++++++++++---------- po/pt_BR.po | 82 ++++++++++---------- po/ro.po | 82 ++++++++++---------- po/rpm.pot | 82 ++++++++++---------- po/ru.po | 82 ++++++++++---------- po/sk.po | 82 ++++++++++---------- po/sl.po | 84 ++++++++++---------- po/sr.po | 82 ++++++++++---------- po/sv.po | 82 ++++++++++---------- po/tr.po | 82 ++++++++++---------- po/uk.po | 82 ++++++++++---------- po/wa.po | 82 ++++++++++---------- po/zh.po | 82 ++++++++++---------- po/zh_CN.GB2312.po | 82 ++++++++++---------- rpm.spec | 1 + rpm.spec.in | 1 + 42 files changed, 1492 insertions(+), 1316 deletions(-) diff --git a/CHANGES b/CHANGES index 2d4b04a2a..76d538301 100644 --- a/CHANGES +++ b/CHANGES @@ -35,6 +35,7 @@ - add some dinky availablePackage methods. - transaction.c: cleanly uncouple availablePackage from TFI_t. - add header refcount annotations throughout. + - depends.c: availablePackage is (almost) opaque. 4.0.3 -> 4.0.4: diff --git a/lib/depends.c b/lib/depends.c index 010a27afc..005f23d21 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -412,8 +412,10 @@ rpmTransactionSet rpmtransCreateSet(rpmdb db, const char * rootDir) ts->currDir = NULL; ts->chrootDone = 0; + ts->numAddedPackages = 0; ts->addedPackages = alCreate(ts->delta); + ts->numAvailablePackages = 0; ts->availablePackages = alCreate(ts->delta); ts->orderAlloced = ts->delta; @@ -452,6 +454,7 @@ static int intcmp(const void * a, const void * b) /*@*/ static int removePackage(rpmTransactionSet ts, int dboffset, int depends) /*@modifies ts @*/ { + transactionElement p; /* Filter out duplicate erasures. */ if (ts->numRemovedPackages > 0 && ts->removedPackages != NULL) { @@ -478,18 +481,20 @@ static int removePackage(rpmTransactionSet ts, int dboffset, int depends) ts->order = xrealloc(ts->order, sizeof(*ts->order) * ts->orderAlloced); } - ts->order[ts->orderCount].type = TR_REMOVED; - ts->order[ts->orderCount].u.removed.dboffset = dboffset; - ts->order[ts->orderCount].u.removed.dependsOnIndex = depends; + p = ts->order + ts->orderCount; + memset(p, 0, sizeof(*p)); + p->type = TR_REMOVED; + p->u.removed.dboffset = dboffset; + p->u.removed.dependsOnIndex = depends; ts->orderCount++; return 0; } -const char * hGetNVR(Header h, const char ** np ) +char * hGetNVR(Header h, const char ** np ) { - const char * NVR, * n, * v, * r; - char * t; + const char * n, * v, * r; + char * NVR, * t; (void) headerNVR(h, &n, &v, &r); NVR = t = xcalloc(1, strlen(n) + strlen(v) + strlen(r) + sizeof("--")); @@ -512,35 +517,73 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd, const char * addNVR = hGetNVR(h, &name); const char * pkgNVR = NULL; 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; int ec = 0; int rc; - int i = ts->orderCount; + int i; /* * Check for previously added versions with the same name. */ i = ts->orderCount; - for (i = 0; i < ts->orderCount; i++) { + apx = 0; + if ((p = ts->order) != NULL) + for (i = 0; i < ts->orderCount; i++, p++) { + const char * pname; Header ph; - if ((p = alGetPkg(ts->addedPackages, i)) == NULL) + /* XXX Only added packages are checked for dupes (for now). */ + switch (p->type) { + case TR_ADDED: + /*@switchbreak@*/ break; + case TR_REMOVED: + default: + continue; + /*@notreached@*/ /*@switchbreak@*/ break; + } + + 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, i); + pkgNVR = alGetNVR(ts->addedPackages, te->u.addedIndex); if (pkgNVR == NULL) /* XXX can't happen */ continue; - ph = alGetHeader(ts->addedPackages, i, 0); + ph = alGetHeader(ts->addedPackages, te->u.addedIndex, 0); +#else + ph = alGetHeader(ts->addedPackages, p->u.addedIndex, 0); + if (ph == NULL) + break; + + pkgNVR = _free(pkgNVR); + pname = NULL; + pkgNVR = hGetNVR(ph, &pname); + + if (strcmp(pname, name)) { + pkgNVR = _free(pkgNVR); + ph = headerFree(ph, "alGetHeader nomatch"); + continue; + } + +#endif rc = rpmVersionCompare(ph, h); - ph = headerFree(ph, "alGetHeader"); + ph = headerFree(ph, "alGetHeader match"); if (rc > 0) { rpmMessage(RPMMESS_WARNING, @@ -556,18 +599,18 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd, rpmMessage(RPMMESS_WARNING, _("older package %s already added, replacing with %s\n"), pkgNVR, addNVR); + duplicate = 1; } break; } /* XXX Note: i == ts->orderCount here almost always. */ - if (i == ts->orderAlloced) { ts->orderAlloced += ts->delta; ts->order = xrealloc(ts->order, ts->orderAlloced * sizeof(*ts->order)); } - ts->order[i].type = TR_ADDED; +#ifdef DYING { availablePackage this = alAddPackage(ts->addedPackages, i, h, key, fd, relocs); alNum = alGetPkgIndex(ts->addedPackages, this); @@ -577,9 +620,49 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd, /* 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; + goto exit; + } + p = ts->order + i; + memset(p, 0, sizeof(*p)); +assert(alNum == apx); + p->u.addedIndex = alNum; +#endif - if (i == ts->orderCount) + p->type = TR_ADDED; + p->multiLib = 0; + +#ifdef NOYET + /* XXX this needs a search over ts->order, not ts->addedPackages */ + { uint_32 *pp = NULL; + /* XXX This should be added always so that packages look alike. + * XXX However, there is logic in files.c/depends.c that checks for + * XXX existence (rather than value) that will need to change as well. + */ + if (hge(h, RPMTAG_MULTILIBS, NULL, (void **) &pp, NULL)) + multiLibMask = *pp; + + if (multiLibMask) { + for (i = 0; i < pkgNum - 1; i++) { + if (!strcmp (p->name, al->list[i].name) + && hge(al->list[i].h, RPMTAG_MULTILIBS, NULL, + (void **) &pp, NULL) + && !rpmVersionCompare(p->h, al->list[i].h) + && *pp && !(*pp & multiLibMask)) + p->multiLib = multiLibMask; + } + } + } +#endif + + if (!duplicate) { +assert(apx == ts->numAddedPackages); + ts->numAddedPackages++; ts->orderCount++; + } if (!upgrade) goto exit; @@ -612,11 +695,14 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd, 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; } } /*@=branchstate@*/ @@ -673,8 +759,13 @@ 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) @@ -709,7 +800,7 @@ rpmTransactionSet rpmtransFree(rpmTransactionSet ts) ts->di = _free(ts->di); ts->removedPackages = _free(ts->removedPackages); ts->order = _free(ts->order); - /*@-type@*/ /* FIX: cast? */ + /*@-type@*/ if (ts->scriptFd != NULL) { ts->scriptFd = fdFree(ts->scriptFd, "rpmtransSetScriptFd (rpmtransFree"); @@ -1016,10 +1107,17 @@ 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; @@ -1532,6 +1630,8 @@ int rpmdepOrder(rpmTransactionSet ts) int qlen; int i, j; +assert(ts->numAddedPackages == alGetSize(ts->addedPackages)); + alMakeIndex(ts->addedPackages); /*@-modfilesystem -nullpass@*/ @@ -1544,6 +1644,7 @@ fprintf(stderr, "*** rpmdepOrder(%p) order %p[%d]\n", ts, ts->order, ts->orderCo 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; @@ -1552,6 +1653,7 @@ fprintf(stderr, "*** rpmdepOrder(%p) order %p[%d]\n", ts, ts->order, ts->orderCo p->name = NULL; p->version = NULL; p->release = NULL; +#endif /* XXX Only added packages are ordered (for now). */ switch (p->type) { @@ -1694,7 +1796,8 @@ rescan: qlen++; /*@-modfilesystem -nullpass@*/ if (_te_debug) -fprintf(stderr, "\t+++ %p[%d] %s addQ ++ q %p %d\n", p, i, p->NEVR, q, qlen); +fprintf(stderr, "\t+++ addQ ++ qlen %d p %p(%s)", qlen, p, p->NEVR); +prtTSI(" p", &p->tsi); /*@=modfilesystem =nullpass@*/ } @@ -1735,6 +1838,11 @@ fprintf(stderr, "\t+++ %p[%d] %s addQ ++ q %p %d\n", p, i, p->NEVR, q, qlen); addQ(p, &q->tsi.tsi_suc, &r); /*@=nullstate@*/ qlen++; +/*@-modfilesystem -nullpass@*/ +if (_te_debug) +fprintf(stderr, "\t+++ addQ ++ qlen %d p %p(%s)", qlen, p, p->NEVR); +prtTSI(" p", &p->tsi); +/*@=modfilesystem =nullpass@*/ } tsi = _free(tsi); } @@ -1869,8 +1977,6 @@ fprintf(stderr, "\t+++ %p[%d] %s addQ ++ q %p %d\n", p, i, p->NEVR, q, qlen); rpmMessage(RPMMESS_ERROR, _("rpmdepOrder failed, %d elements remain\n"), loopcheck); return loopcheck; - - return 1; } /* @@ -1994,9 +2100,11 @@ int rpmdepCheck(rpmTransactionSet ts, HFD_t hfd = headerFreeData; rpmdbMatchIterator mi = NULL; Header h = NULL; - availablePackage p; problemsSet ps = NULL; + transactionElement p; +#ifdef DYING int numAddedPackages; +#endif int closeatexit = 0; int i, j, xx; int rc; @@ -2008,7 +2116,9 @@ int rpmdepCheck(rpmTransactionSet ts, closeatexit = 1; } +#ifdef DYING numAddedPackages = alGetSize(ts->addedPackages); +#endif ps = xcalloc(1, sizeof(*ps)); ps->alloced = 5; @@ -2025,24 +2135,41 @@ int rpmdepCheck(rpmTransactionSet ts, * Look at all of the added packages and make sure their dependencies * are satisfied. */ - for (i = 0; i < numAddedPackages; i++) - { - char * pkgNVR, * n, * v, * r; + if ((p = ts->order) != NULL) + for (i = 0; i < ts->orderCount; i++, p++) { + char * pkgNVR = NULL, * n, * v, * r; rpmDepSet provides; uint_32 multiLib; - if ((p = alGetPkg(ts->addedPackages, i)) == NULL) - break; + /* XXX Only added packages are checked (for now). */ + switch (p->type) { + case TR_ADDED: + /*@switchbreak@*/ break; + case TR_REMOVED: + default: + continue; + /*@notreached@*/ /*@switchbreak@*/ break; + } - pkgNVR = alGetNVR(ts->addedPackages, i); +#ifdef DYING + pkgNVR = alGetNVR(ts->addedPackages, p->u.addedIndex); if (pkgNVR == NULL) /* XXX can't happen */ break; - multiLib = alGetMultiLib(ts->addedPackages, i); + multiLib = alGetMultiLib(ts->addedPackages, p->u.addedIndex); +#else + h = alGetHeader(ts->addedPackages, p->u.addedIndex, 0); + if (h == NULL) /* XXX can't happen */ + break; + + pkgNVR = _free(pkgNVR); + pkgNVR = hGetNVR(h, NULL); + multiLib = p->multiLib; +#endif rpmMessage(RPMMESS_DEBUG, "========== +++ %s\n" , pkgNVR); - h = alGetHeader(ts->addedPackages, i, 0); rc = checkPackageDeps(ts, ps, h, NULL, multiLib); h = headerFree(h, "alGetHeader"); + if (rc) { pkgNVR = _free(pkgNVR); goto exit; @@ -2061,7 +2188,7 @@ int rpmdepCheck(rpmTransactionSet ts, if (rc) goto exit; - provides = alGetProvides(ts->addedPackages, i); + provides = alGetProvides(ts->addedPackages, p->u.addedIndex); if (provides->Count == 0 || provides->N == NULL) continue; diff --git a/lib/depends.h b/lib/depends.h index 9cab805d5..c103b3bf8 100644 --- a/lib/depends.h +++ b/lib/depends.h @@ -60,6 +60,7 @@ struct transactionElement_s { char * version; /*@dependent@*/ /*@null@*/ char * release; + int npreds; /*!< No. of predecessors. */ int depth; /*!< Max. depth in dependency tree. */ struct tsortInfo_s tsi; @@ -67,6 +68,10 @@ struct transactionElement_s { TR_ADDED, /*!< Package will be installed. */ TR_REMOVED /*!< Package will be removed. */ } type; /*!< Package disposition (installed/removed). */ + + uint_32 multiLib; /* (TR_ADDED) MULTILIB */ + int_32 filesCount; /* (TR_ADDED) No. files in package. */ + /*@-fielduse@*/ /* LCL: confused by union? */ union { /*@unused@*/ int addedIndex; @@ -76,6 +81,7 @@ struct transactionElement_s { } removed; } u; /*@=fielduse@*/ + }; /** @@ -105,29 +111,39 @@ struct rpmTransactionSet_s { rpmProblemSet probs; /*!< Current problems in transaction. */ rpmprobFilterFlags ignoreSet; /*!< Bits to filter current problems. */ + int filesystemCount; /*!< No. of mounted filesystems. */ /*@dependent@*/ const char ** filesystems; /*!< Mounted filesystem names. */ /*@only@*/ struct diskspaceInfo * di; /*!< Per filesystem disk/inode usage. */ + int dbmode; /*!< Database open mode. */ /*@refcounted@*/ /*@null@*/ rpmdb rpmdb; /*!< Database handle. */ /*@only@*/ hashTable ht; /*!< Fingerprint hash table. */ + /*@only@*/ int * removedPackages; /*!< Set of packages being removed. */ - int numRemovedPackages; /*!< No. removed rpmdb instances. */ + int numRemovedPackages; /*!< No. removed package instances. */ int allocedRemovedPackages; /*!< Size of removed packages array. */ + /*@only@*/ availableList addedPackages;/*!< Set of packages being installed. */ + int numAddedPackages; /*!< No. added package instances. */ + /*@only@*/ availableList availablePackages; - /*!< Universe of possible packages. */ + /*!< Universe of available packages. */ + int numAvailablePackages; /*!< No. available package instances. */ + /*@only@*/ transactionElement order; /*!< Packages sorted by dependencies. */ int orderCount; /*!< No. of transaction elements. */ int orderAlloced; /*!< No. of allocated transaction elements. */ + /*@only@*/ TFI_t flList; /*!< Transaction element(s) file info. */ + int flEntries; /*!< No. of transaction elements. */ int chrootDone; /*!< Has chroot(2) been been done? */ /*@only@*/ const char * rootDir;/*!< Path to top of install tree. */ @@ -170,7 +186,7 @@ extern "C" { * @retval np name tag value * @return name-version-release string */ -/*@only@*/ const char * hGetNVR(Header h, /*@out@*/ const char ** np ) +/*@only@*/ char * hGetNVR(Header h, /*@out@*/ const char ** np ) /*@modifies *np @*/; /** \ingroup rpmdep diff --git a/lib/header.c b/lib/header.c index a4298aac6..01556bd56 100644 --- a/lib/header.c +++ b/lib/header.c @@ -107,7 +107,9 @@ Header XheaderLink(Header h, const char * msg, const char * fn, unsigned ln) if (_h_debug) fprintf(stderr, "--> h %p ++ %d %s at %s:%u\n", h, (h != NULL ? h->nrefs : 0), msg, fn, ln); /*@=modfilesystem@*/ - /*@-refcounttrans@*/ return h; /*@=refcounttrans@*/ + /*@-refcounttrans -nullret @*/ + return h; + /*@=refcounttrans =nullret @*/ } /** \ingroup header @@ -124,7 +126,7 @@ Header XheaderUnlink(/*@killref@*/ /*@null@*/ Header h, if (_h_debug) fprintf(stderr, "--> h %p -- %d %s at %s:%u\n", h, (h != NULL ? h->nrefs : 0), msg, fn, ln); /*@=modfilesystem@*/ - h->nrefs--; + if (h != NULL) h->nrefs--; return NULL; } @@ -140,6 +142,7 @@ Header XheaderFree( /*@null@*/ /*@killref@*/ Header h, { (void) XheaderUnlink(h, msg, fn, ln); + /*@-usereleased@*/ if (h == NULL || h->nrefs > 0) return NULL; /* XXX return previous header? */ @@ -163,6 +166,7 @@ Header XheaderFree( /*@null@*/ /*@killref@*/ Header h, /*@-refcounttrans@*/ h = _free(h); /*@=refcounttrans@*/ return h; + /*@=usereleased@*/ } /** \ingroup header diff --git a/lib/header.h b/lib/header.h index 3bd4664b5..80e17773b 100644 --- a/lib/header.h +++ b/lib/header.h @@ -320,7 +320,7 @@ Header (*HDRlink) (Header h, const char * msg, const char * fn, unsigned ln) * @return NULL always */ typedef -Header (*HDRunlink) (/*@killref@*/ Header h, +Header (*HDRunlink) (/*@killref@*/ /*@null@*/ Header h, const char * msg, const char * fn, unsigned ln) /*@modifies h @*/; diff --git a/lib/psm.c b/lib/psm.c index e657ec662..3e82a49a0 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -1205,7 +1205,7 @@ rpmRC rpmInstallSourcePackage(rpmTransactionSet ts, goto exit; } - fi->multiLib = alGetMultiLib(ts->addedPackages, 0); + fi->multiLib = 0; /* MULTILIB for src.rpm's? */ /*@-kepttrans@*/ fi->key = alGetKey(ts->addedPackages, 0); /*@=kepttrans@*/ diff --git a/lib/rpmal.c b/lib/rpmal.c index 41cbbb9b0..5ae89852e 100644 --- a/lib/rpmal.c +++ b/lib/rpmal.c @@ -125,11 +125,13 @@ const void * alGetKey(const availableList al, int pkgNum) /*@=retexpose@*/ } +#ifdef DYING int alGetMultiLib(const availableList al, int pkgNum) { availablePackage alp = alGetPkg(al, pkgNum); return (alp != NULL ? alp->multiLib : 0); } +#endif int alGetFilesCount(const availableList al, int pkgNum) { @@ -421,7 +423,7 @@ fprintf(stderr, "*** del %p[%d] %s-%s-%s\n", al->list, pkgNum, p->name, p->versi /*@=nullstate@*/ } -availablePackage +long alAddPackage(availableList al, int pkgNum, Header h, /*@null@*/ /*@dependent@*/ const void * key, /*@null@*/ FD_t fd, /*@null@*/ rpmRelocation * relocs) @@ -432,8 +434,10 @@ alAddPackage(availableList al, int pkgNum, rpmTagType dnt, bnt; availablePackage p; int i, xx; +#ifdef DYING uint_32 multiLibMask = 0; uint_32 * pp = NULL; +#endif if (pkgNum >= 0 && pkgNum < al->size) { alDelPackage(al, pkgNum); @@ -447,8 +451,10 @@ alAddPackage(availableList al, int pkgNum, p = al->list + pkgNum; - p->h = headerLink(h, "alAddPackage"); /* XXX reference held by transaction set */ + p->h = headerLink(h, "alAddPackage"); +#ifdef DYING p->multiLib = 0; /* MULTILIB */ +#endif xx = headerNVR(p->h, &p->name, &p->version, &p->release); @@ -457,6 +463,8 @@ if (_al_debug) fprintf(stderr, "*** add %p[%d] %s-%s-%s\n", al->list, pkgNum, p->name, p->version, p->release); /*@=modfilesys@*/ +#ifdef DYING + { uint_32 *pp = NULL; /* XXX This should be added always so that packages look alike. * XXX However, there is logic in files.c/depends.c that checks for * XXX existence (rather than value) that will need to change as well. @@ -474,6 +482,8 @@ fprintf(stderr, "*** add %p[%d] %s-%s-%s\n", al->list, pkgNum, p->name, p->versi p->multiLib = multiLibMask; } } + } +#endif if (!hge(h, RPMTAG_EPOCH, NULL, (void **) &p->epoch, NULL)) p->epoch = NULL; @@ -614,7 +624,8 @@ fprintf(stderr, "*** add %p[%d] %s-%s-%s\n", al->list, pkgNum, p->name, p->versi alFreeIndex(al); - return p; +assert((p - al->list) == pkgNum); + return (p - al->list); } /** @@ -654,12 +665,14 @@ void alMakeIndex(availableList al) for (i = 0; i < al->size; i++) { for (j = 0; j < al->list[i].provides.Count; j++) { +#ifdef NOTNOW /* XXX FIXME: multilib colored dependency search */ /* If multilib install, skip non-multilib provides. */ if (al->list[i].multiLib && !isDependsMULTILIB(al->list[i].provides.Flags[j])) { ai->size--; /*@innercontinue@*/ continue; } +#endif ai->index[k].package = al->list + i; /*@-assignexpose@*/ @@ -725,6 +738,7 @@ alAllFileSatisfiesDepend(const availableList al, strcmp(dirMatch->files[i].baseName, baseName)) /*@innercontinue@*/ continue; +#ifdef NOTNOW /* XXX FIXME: multilib colored dependency search */ /* * If a file dependency would be satisfied by a file * we are not going to install, skip it. @@ -732,6 +746,7 @@ alAllFileSatisfiesDepend(const availableList al, if (al->list[dirMatch->files[i].pkgNum].multiLib && !isFileMULTILIB(dirMatch->files[i].fileFlags)) /*@innercontinue@*/ continue; +#endif if (keyType) rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (added files)\n"), diff --git a/lib/rpmal.h b/lib/rpmal.h index 787c68f9d..c56267b52 100644 --- a/lib/rpmal.h +++ b/lib/rpmal.h @@ -19,7 +19,9 @@ struct availablePackage_s { /*@owned@*//*@null@*/ const char ** baseNames; /*!< Header file basenames. */ /*@dependent@*//*@null@*/ int_32 * epoch; /*!< Header epoch (if any). */ int filesCount; /*!< No. of files in header. */ +#ifdef DYING uint_32 multiLib; /* MULTILIB */ +#endif /*@kept@*//*@null@*/ const void * key; /*!< Private data associated with a package (e.g. file name of package). */ /*@null@*/ rpmRelocation * relocs; /*@null@*/ FD_t fd; @@ -47,6 +49,7 @@ int alGetSize(const availableList al) const void * alGetKey(/*@null@*/ const availableList al, int pkgNum) /*@*/; +#ifdef DYING /** * Return available package multiLib flag. * @param al available list @@ -55,6 +58,7 @@ const void * alGetKey(/*@null@*/ const availableList al, int pkgNum) */ int alGetMultiLib(/*@null@*/ const availableList al, int pkgNum) /*@*/; +#endif /** * Return available package files count. @@ -121,9 +125,11 @@ FD_t alGetFd(/*@null@*/ availableList al, int pkgNum) * @param pkgNum available package index * @return available package pointer */ +/*@-exportlocal@*/ /*@dependent@*/ /*@null@*/ availablePackage alGetPkg(/*@null@*/ availableList al, int pkgNum) /*@*/; +/*@=exportlocal@*/ /** * Return available package index. @@ -193,10 +199,9 @@ void alDelPackage(availableList al, int pkgNum) * @param key package private data * @param fd package file handle * @param relocs package file relocations - * @return available package pointer + * @return available package index */ -/*@exposed@*/ -availablePackage alAddPackage(availableList al, int pkgNum, +long alAddPackage(availableList al, int pkgNum, Header h, /*@null@*/ /*@dependent@*/ const void * key, /*@null@*/ FD_t fd, /*@null@*/ rpmRelocation * relocs) /*@modifies al, h @*/; diff --git a/lib/transaction.c b/lib/transaction.c index 4619d0587..8dcf757e0 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -1118,8 +1118,10 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ /* XXX multilib should not display "already installed" problems */ if (!(ts->ignoreSet & RPMPROB_FILTER_REPLACEPKG) - && !alGetMultiLib(ts->addedPackages, i)) - { +#ifdef DYING /* XXX MULTILIB multiLib from transactionElement */ + && !alGetMultiLib(ts->addedPackages, i) +#endif + ) { mi = rpmtsInitIterator(ts, RPMTAG_NAME, n, 0); xx = rpmdbSetIteratorRE(mi, RPMTAG_VERSION, RPMMIRE_DEFAULT, v); xx = rpmdbSetIteratorRE(mi, RPMTAG_RELEASE, RPMMIRE_DEFAULT, r); @@ -1181,7 +1183,11 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ i = ts->order[oc].u.addedIndex; fi->h = alGetHeader(ts->addedPackages, i, 1); +#ifdef DYING /* XXX MULTILIB multiLib from transactionElement */ fi->multiLib = alGetMultiLib(ts->addedPackages, i); +#else + fi->multiLib = ts->order[oc].multiLib; +#endif /*@-kepttrans@*/ fi->key = alGetKey(ts->addedPackages, i); /*@=kepttrans@*/ diff --git a/po/cs.po b/po/cs.po index bbb21fe7f..319dff2c8 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "ANO" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 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:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "balíèek %s je ji¾ nainstalován" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-s (ke¹ováno)\n" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s ANO (rpmrc poskytuje)\n" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s ANO (rpmlib poskytuje)\n" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s ANO (db soubory)\n" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s ANO (db poskytuje)\n" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s ANO (db balíèek)\n" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NE\n" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, 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,54 +1518,54 @@ msgstr "%s: (%s, %s) p #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, 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:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "balíèek %s koliduje: %s\n" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, 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:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "========== ukládání tsort relací\n" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 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:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "SMYÈKA:\n" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "========== pokraèuje tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "(není èíslo)" @@ -1659,88 +1659,88 @@ msgstr "%s vytvo #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "Poèet dataLength() RPM_STRING_TYPE musí být 1.\n" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "Datový typ %d není podporován\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "chybí { po %" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "po %{ chybí }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "prázdný formát znaèky" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "prázdné jméno znaèky" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "neznámá znaèka" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "na konci pole oèekáváno ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "neoèekávaná ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "neoèekávaná }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "ve výrazu oèekáván ?" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "ve výrazu je po ? oèekávána {" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "ve výrazu je oèekávána }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "v podvýrazu je po ? oèekávána :" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "ve výrazu je po : oèekávána {" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "na konci výrazu je oèekáváno |" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "(neznámý typ)" diff --git a/po/da.po b/po/da.po index 6cd255496..6dcd881f9 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 #, 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:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "pakken %s er allerede installeret" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-3s (husket)\n" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s JA (rpmrc tilfører)\n" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s JA (rpmlib tilfører)\n" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s JA (db-filer)\n" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s JA (db tilfører)\n" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s JA (db-pakke)\n" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NEJ\n" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) tilføjet til afhængigheds-buffer.\n" @@ -1520,53 +1520,53 @@ msgstr "%s: (%s, %s) tilf #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, 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:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "pakke %s skaber konflikt: %s\n" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, 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:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "========== gemmer tsort-relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "LØKKE:\n" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "========== fortsætter tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "(ikke et tal)" @@ -1659,88 +1659,88 @@ msgstr "%s oprettet som %s\n" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE-antal skal være 1.\n" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "Datatype %d understøttes ikke\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "manglende { efter %" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "manglende } efter %{" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "tomt mærkeformat" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "tomt mærkenavn" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "ukendt mærke" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "] forventet ved slutningen af tabel" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "uventet ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "uventet }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "? forventet i udtryk" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "{ forventet efter ? i udtryk" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "} forventet i udtryk" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr ": forventet efter ?-underudtryk" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "{ forventet efter : i udtryk" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "| forventet ved slutningen af udtryk" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "(ukendt type)" diff --git a/po/de.po b/po/de.po index 80b8e42d4..eee05f3a1 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 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:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "Paket %s ist nicht installiert\n" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:841 +#: lib/depends.c:932 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:891 +#: lib/depends.c:982 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" @@ -1652,54 +1652,54 @@ msgstr "die Datei #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, 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:1074 +#: lib/depends.c:1172 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" # FIXME -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, 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:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "(keine Zahl)" @@ -1796,91 +1796,91 @@ msgstr "kann Datei %s nicht #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "fehlende { nach %{" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "fehlende } nach %{" # »Tag« übersetzen??? -ke- #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "leeres »Tag«-Format" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "leerer »Tag«-Name" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "unbekannter »Tag«" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "] am Ende des Arrays erwartet" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "unerwartete ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "unerwartete }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "? im Ausdruck erwartet" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 #, fuzzy msgid "{ expected after ? in expression" msgstr "{ nach ? im Ausdruck erwartet" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "} im Ausdruck erwartet" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr ": nach ? Unterausdruck erwartet" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 #, fuzzy msgid "{ expected after : in expression" msgstr "{ nach : im Ausdruck erwartet" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "| am Ende des Ausdrucks erwartet" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "(unbekannter Typ)" diff --git a/po/en_RN.po b/po/en_RN.po index 5190ae95a..c7a373d18 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,53 +1494,53 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "" @@ -1631,88 +1631,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "" diff --git a/po/es.po b/po/es.po index 5190ae95a..c7a373d18 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,53 +1494,53 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "" @@ -1631,88 +1631,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "" diff --git a/po/eu_ES.po b/po/eu_ES.po index 5190ae95a..c7a373d18 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,53 +1494,53 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "" @@ -1631,88 +1631,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "" diff --git a/po/fi.po b/po/fi.po index e5c06f328..5019559d8 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 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:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:841 +#: lib/depends.c:932 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:891 +#: lib/depends.c:982 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "tiedostoa %s ei omista mikään paketti\n" @@ -1535,53 +1535,53 @@ msgstr "tiedostoa %s ei omista mik #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, 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:1074 +#: lib/depends.c:1172 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "(ei ole luku)" @@ -1674,90 +1674,90 @@ msgstr "en voinut avata tiedostoa %s: " #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "puuttuva '{' '%':n jälkeen" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "puuttuva '{' '%{':n jälkeen" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "tyhjä nimiön formaatti" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "tyhjä nimiön nimi" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "tuntematon nimiö" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "']' puuttuu taulukkomäärittelyn lopusta" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "odottamaton ']'" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "odottamaton '}'" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "odotin '?'-merkkiä ilmauksessa" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 #, fuzzy msgid "{ expected after ? in expression" msgstr "odotin '{' '?'-merkin jälkeen ilmauksessa " #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "odotin '}'-merkkiä ilmauksessa" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "odotin ':' '?'-merkin jälkeen ali-ilmauksessa " #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 #, fuzzy msgid "{ expected after : in expression" msgstr "odotin '{' ':'-merkin jälkeen ilmauksessa " #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "odotin '}'-merkkiä ilmauksen lopussa" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "(tuntematon tyyppi)" diff --git a/po/fr.po b/po/fr.po index 3d98bb8e0..79894a8ba 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 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:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1575,53 +1575,53 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, 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:1074 +#: lib/depends.c:1172 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "impossible d'ouvrir: %s\n" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "" @@ -1712,90 +1712,90 @@ msgstr "impossible d'ouvrir: %s\n" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 #, fuzzy msgid "unexpected ]" msgstr "source de requte inattendue" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 #, fuzzy msgid "unexpected }" msgstr "source de requte inattendue" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "" diff --git a/po/gl.po b/po/gl.po index e37cd014e..807e00faf 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "NO " msgstr "" @@ -1431,57 +1431,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1489,53 +1489,53 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "" @@ -1626,88 +1626,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "" diff --git a/po/hu.po b/po/hu.po index 5190ae95a..c7a373d18 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,53 +1494,53 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "" @@ -1631,88 +1631,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "" diff --git a/po/id.po b/po/id.po index 5190ae95a..c7a373d18 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,53 +1494,53 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "" @@ -1631,88 +1631,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "" diff --git a/po/is.po b/po/is.po index f24f9a1b4..9360e7559 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 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:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,53 +1494,53 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "" @@ -1631,88 +1631,88 @@ msgstr "%s b #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "" diff --git a/po/it.po b/po/it.po index 5190ae95a..c7a373d18 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,53 +1494,53 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "" @@ -1631,88 +1631,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "" diff --git a/po/ja.po b/po/ja.po index 66ace6e28..457a9a37d 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "NO " msgstr "" @@ -1511,57 +1511,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" -#: lib/depends.c:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %s ¤Ï db ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" -#: lib/depends.c:824 +#: lib/depends.c:915 #, fuzzy, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:841 +#: lib/depends.c:932 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, fuzzy, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:891 +#: lib/depends.c:982 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %s ¤Ï db ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" @@ -1569,53 +1569,53 @@ msgstr "%s: %s #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n" #. conflicts exist. -#: lib/depends.c:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹: %s\n" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "(¿ô»ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)" @@ -1708,89 +1708,89 @@ msgstr " #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 #, fuzzy msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabDate() RPM_STRING_TYPE ¥«¥¦¥ó¥È¤Ï 1 ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "¥Ç¡¼¥¿¥¿¥¤¥× %d ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "% ¤Î¸å¤Ë { ¤¬¤¢¤ê¤Þ¤»¤ó" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "%{ ¤Î¸å¤Ë } ¤¬¤¢¤ê¤Þ¤»¤ó" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "¶õ¤Î¥¿¥°¥Õ¥©¡¼¥Þ¥Ã¥È" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "¶õ¤Î¥¿¥°Ì¾" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "ÉÔÌÀ¤Ê¥¿¥°" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "ÇÛÎó¤Î¸å¤Ë ] ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "ͽ´ü¤»¤Ì ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "ͽ´ü¤»¤Ì }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "¼°Ãæ¤Ç ? ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "¼°Ãæ¤Ç ? ¤Î¸å¤Ë { ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "¼°Ãæ¤Ë } ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "°Ê²¼¤Î ? ¥µ¥Ö¼°¤Î ¤Ë: ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "¼°Ãæ¤Ç : ¤Î¸å¤Ë { ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "¼°¤Î½ª¤ê¤Ë | ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "(ÉÔÌÀ¤Ê¥¿¥¤¥×)" diff --git a/po/ko.po b/po/ko.po index 2f82c9bb1..9ac116226 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "¿¹" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "NO " msgstr "¾Æ´Ï¿À" @@ -1451,57 +1451,57 @@ msgstr " msgid "cannot open Packages database in %s\n" msgstr "%s ¾ÈÀÇ ÆÐÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/depends.c:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "%s ÆÐÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-s (ij½ÃµÊ)\n" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s ¿¹ (rpmrcÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s ¿¹ (rpmlibÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s ¿¹ (db ÆÄÀÏ)\n" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s ¿¹ (db ÆÐÅ°Áö)\n" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s ¾Æ´Ï¿À\n" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) ÀÇÁ¸(Depends) ij½Ã¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù.\n" @@ -1509,54 +1509,54 @@ msgstr "%s: (%s, %s) #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "%s-%s-%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n" #. conflicts exist. -#: lib/depends.c:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "ÆÐÅ°Áö %s (ÀÌ)°¡ Ãæµ¹ÇÔ: %s\n" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort °ü°è¿¡¼­ %s-%s-%s \"%s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== ÆÐÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼­, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, ±íÀÌ[depth])\n" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "========== ÈÄÀÓÀÚ [successors only] (Ç¥Çö ¼ø)\n" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "·çÇÁ(LOOP):\n" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "(¼ýÀÚ°¡ ¾Æ´Õ´Ï´Ù)" @@ -1650,88 +1650,88 @@ msgstr "%s ( #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE Ä«¿îÆ®´Â ¹Ýµå½Ã '1' À̾î¾ß ÇÕ´Ï´Ù.\n" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "%d µ¥ÀÌÅÍ À¯ÇüÀº »ç¿ëÇÏ½Ç ¼ö ¾ø½À´Ï´Ù\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "'%' µÚ¿¡ '{' ¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "'%{' µÚ¿¡ '}' ¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "ÅÂ±× Çü½ÄÀÌ ºñ¾îÀÖ½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "ÅÂ±× À̸§ÀÌ ºñ¾îÀÖ½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "¾Ë ¼ö ¾ø´Â ÅÂ±× ÀÔ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "¹è¿­ÀÇ ³¡ºÎºÐ¿¡ ']' °¡ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "ºÒÇÊ¿äÇÑ ']' °¡ »ç¿ëµÇ°í ÀÖ½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "ºÒÇÊ¿äÇÑ '}' °¡ »ç¿ëµÇ°í ÀÖ½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "Ç¥Çö½Ä¿¡ '?' °¡ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "Ç¥Çö½Ä¿¡¼­ '?' µÚ¿¡ '{' °¡ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "Ç¥Çö½Ä¿¡ '}' °¡ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "ÇϺΠǥÇö½Ä(subexpression)ÀÇ '?' ´ÙÀ½¿¡ ':' ÀÌ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "Ç¥Çö½Ä¿¡¼­ ':' µÚ¿¡ '{' °¡ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "Ç¥Çö½ÄÀÇ ³¡ºÎºÐ¿¡ '|' °¡ ÇÊ¿äÇÕ´Ï´Ù" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "(¾Ë ¼ö ¾ø´Â À¯Çü)" diff --git a/po/no.po b/po/no.po index f6a65346a..cf01ed8dd 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "JA" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 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:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "pakke %s er allerede installert" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1508,53 +1508,53 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "pakke %s er i konflikt: %s\n" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "" @@ -1645,88 +1645,88 @@ msgstr "%s opprettet som %s\n" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "Datatype %d ikke støttet\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "mangler { etter %" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "mangler } etter %{" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "(ukjent type)" diff --git a/po/pl.po b/po/pl.po index 947398ac1..fbe18631e 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 #, 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:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:841 +#: lib/depends.c:932 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:891 +#: lib/depends.c:982 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" @@ -1550,53 +1550,53 @@ msgstr "plik %s nie nale #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, 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:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "pakiet %s jest w konflikcie: %s\n" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "usuwanie indeksu grupy\n" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "(nie jest liczb±)" @@ -1689,89 +1689,89 @@ msgstr "ostrze #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 #, fuzzy msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabData() RPM_STRING_TYPE licznik musi byæ 1.\n" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "Typ danych %d nie jest obs³ugiwany\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "brak { po %" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "brak } po %{" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "pusty format etykiety" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "pusta nazwa etykiety" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "nieznana etykieta" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "spodziewany ] na koñcu tablicy" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "nie spodziewany ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "nie spodziewany }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "spodziewany ? w wyra¿eniu" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "spodziewany { po ? w wyra¿eniu" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "spodziewany } w wyra¿eniu" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "spodziewany : po podwyra¿eniu ?" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "spodziewany { po : w wyra¿eniu" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "spodziewany | na koñcu wyra¿enia" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "(nieznany typ)" diff --git a/po/pt.po b/po/pt.po index 348b3db13..82b1293e5 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 #, 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:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "o pacote %s já está instalado" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-3s (em cache)\n" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s SIM (oferecidos pelo rpmrc)\n" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s SIM (oferecidos pela rpmlib)\n" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s SIM (ficheiros db)\n" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s SI (oferecidos pelo db)\n" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s SIM (pacote db)\n" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NÃO\n" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) adicionado à cache de dependências.\n" @@ -1507,53 +1507,53 @@ msgstr "%s: (%s, %s) adicionado #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, 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:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "o pacote %s está em conflito: %s\n" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, 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:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "=========== a guardar as relações do tsort\n" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "========== só os sucessores (ordem de apresentação)\n" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "CICLO:\n" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "========== a prosseguir o tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "(não é um número)" @@ -1646,88 +1646,88 @@ msgstr "%s criado como %s\n" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "o valor RPM_STRING_TYPE do dataLength() tem de ser 1.\n" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "O tipo de dados %d não é suportado\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "falta um { depois do %" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "falta um } depois do %{" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "formato da opção em branco" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "nome da opção em branco" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "opção desconhecida" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "] esperado no fim do vector" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "] inesperado" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "} inesperado" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "esperado um ? na expressão" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "esperado um { a seguir ao ? na expressão" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "esperado um } na expressão" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "esperado um : a seguir à sub-expressão ?" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "esperado um { a seguir ao : na expressão" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "esperado um | no fim da expressão" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "(tipo desconhecido)" diff --git a/po/pt_BR.po b/po/pt_BR.po index b57badc77..7242eb1b2 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 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:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "no foi passado pacote para instalao" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1662,54 +1662,54 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, 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:1074 +#: lib/depends.c:1172 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "no foi passado pacote para desinstalao" # , c-format -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "No consegui abrir: %s\n" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "" @@ -1807,90 +1807,90 @@ msgstr "No consegui abrir: %s\n" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 #, fuzzy msgid "unexpected ]" msgstr "fonte de pesquisa no esperado" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 #, fuzzy msgid "unexpected }" msgstr "fonte de pesquisa no esperado" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "" diff --git a/po/ro.po b/po/ro.po index ca463dee3..82daf2ed3 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "NO " msgstr "" @@ -1431,57 +1431,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1489,53 +1489,53 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "" @@ -1626,88 +1626,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index 3ed965e3b..ef1c4cbd6 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,53 +1494,53 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "" @@ -1631,88 +1631,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "" diff --git a/po/ru.po b/po/ru.po index 19e17831b..5e7f3abbf 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "äá" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "NO " msgstr "îåT" @@ -1469,57 +1469,57 @@ msgstr " msgid "cannot open Packages database in %s\n" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n" -#: lib/depends.c:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "ÐÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-s (cached)\n" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s YES (rpmrc provides)\n" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s YES (rpmlib provides)\n" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s YES (db files)\n" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s YES (db provides)\n" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s YES (db package)\n" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NO\n" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) ÄÏÂÁ×ÌÅÎÏ × ËÅÛ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" @@ -1527,55 +1527,55 @@ msgstr "%s: (%s, %s) #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n" #. conflicts exist. -#: lib/depends.c:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "ÐÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó: %s\n" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "========== ÚÁÐÉÓØ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== ÓÏÒÔÉÒÏ×ËÁ ÐÁËÅÔÏ× (ÏÞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, " "ÇÌÕÂÉÎÁ)\n" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "========== ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌÉ (× ÐÏÒÑÄËÅ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ)\n" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "ãéëì:\n" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "========== ÐÒÏÄÏÌÖÅÎÉÅ ÕÐÏÒÑÄÏÞÅÎÉÑ ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "(ÎÅ ÞÉÓÌÏ)" @@ -1669,88 +1669,88 @@ msgstr "%s #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() ÄÏÐÕÓÔÉÍ ÔÏÌØËÏ ÏÄÉÎ ÜÌÅÍÅÎÔ ÔÉÐÁ RPM_STRING_TYPE\n" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "ôÉÐ ÄÁÎÎÙÈ %d ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ \"{\" ÐÏÓÌÅ \"%\"" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ \"}\" ÐÏÓÌÅ \"%{\"" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "ÐÕÓÔÏÊ ÆÏÒÍÁÔ ÔÜÇÁ" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "ÐÕÓÔÏÅ ÉÍÑ ÔÜÇÁ" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÜÇ" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "× ËÏÎÃÅ ÍÁÓÓÉ×Á ÏÖÉÄÁÌÁÓØ \"]\"" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "ÎÅÏÖÉÄÁÎÎÁÑ \"]\"" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "ÎÅÏÖÉÄÁÎÎÁÑ \"}\"" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÏÖÉÄÁÌÏÓØ \"?\"" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \"?\" ÏÖÉÄÁÌÏÓØ \"{\"" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÏÖÉÄÁÌÏÓØ \"}\"" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \"?\" ÏÖÉÄÁÌÏÓØ \":\"" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \":\" ÏÖÉÄÁÌÏÓØ \"{\"" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "× ËÏÎÃÅ ×ÙÒÁÖÅÎÉÑ ÏÖÉÄÁÌÓÑ \"|\"" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "(ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ)" diff --git a/po/sk.po b/po/sk.po index dab88b839..b58c9cc66 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 #, 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:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:841 +#: lib/depends.c:932 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:891 +#: lib/depends.c:982 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" @@ -1549,53 +1549,53 @@ msgstr "s #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, 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:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "balík %s koliduje: %s\n" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, 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:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "(nie je èíslo)" @@ -1688,89 +1688,89 @@ msgstr "varovanie: %s vytvoren #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 #, fuzzy msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabData() RPM_STRING_TYPE poèet musí by» 1.\n" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "Typ údajov %d nie je podorovaný\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "chýbajúce { po %" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "chýbajúce } po %{" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "prázdny tag formát" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "prázdne meno tagu" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "neznámy tag" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "] oèakávané na konci poµa" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "neoèakávané ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "neoèakávané }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "? oèakávané vo výraze" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "{ oèakávané po ? vo výraze" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "} oèakávané vo výraze" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr ": oèakávané po ? podvýraze" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "{ oèakávané po : vo výraze" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "| oèakávené na konci výrazu" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "(neznámy typ)" diff --git a/po/sl.po b/po/sl.po index 20d3b0c6f..a37ae36f7 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.182 2001/11/01 20:15:19 jbj Exp $ +# $Id: sl.po,v 1.183 2001/11/01 23:18:38 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-01 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 #, 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:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paket %s-%s-%s je ¾e name¹èen" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-3s (predpomnjeno)\n" -#: lib/depends.c:824 +#: lib/depends.c:915 #, fuzzy, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s DA (rpmrc ponudbe)\n" -#: lib/depends.c:841 +#: lib/depends.c:932 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s DA (rpmlib ponudbe)\n" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s DA (db datoteke)\n" -#: lib/depends.c:877 +#: lib/depends.c:968 #, fuzzy, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s DA (db ponudbe)\n" -#: lib/depends.c:891 +#: lib/depends.c:982 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %s zadovoljen ob paketih db.\n" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NE\n" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n" @@ -1552,53 +1552,53 @@ msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, 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:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "paket %s jw v sporu z: %s\n" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstranjujemo seznam skupin\n" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "(ni ¹tevilo)" @@ -1691,89 +1691,89 @@ msgstr "opozorilo: %s ustvarjen kot %s" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 #, fuzzy msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "¹tevec grabData() RPM_STRING_TYPE mora biti 1.\n" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "Tip podatkov %d ni podprt\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "manjkajoèi { za %" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "manjkajoèi } za %{" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "oblika znaèke manjka" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "ime znaèke manjka" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "neznana znaèka" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "na koncu polja je prièakovan ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "neprièakovan ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "neprièakovan }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "v izrazu je prièakovan ?" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "v izrazu je za { prièakovan ?" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "v izrazu je prièakovan }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "za podizrazom ? je prièakovano :" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "v izrazu je za : prièakovan {" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "na koncu izraza je prièakovan |" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "(neznan tip)" diff --git a/po/sr.po b/po/sr.po index 9b31e9136..79b4c5e5e 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 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:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paket %s nije instaliran\n" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:841 +#: lib/depends.c:932 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:891 +#: lib/depends.c:982 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "datoteka %s ne pripada nijednom paketu\n" @@ -1533,53 +1533,53 @@ msgstr "datoteka %s ne pripada nijednom paketu\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, 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:1074 +#: lib/depends.c:1172 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "paket %s nije naveden u %s" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, 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:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "(nije broj)" @@ -1672,90 +1672,90 @@ msgstr "Ne mogu da otvorim datoteku %s: " #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "nedostaje { posle %" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "nedostaje } posle %" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "prazan 'tag' format'" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "prazno ime tag-a" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "nepoznat tag" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "] oèekivano na kraju niza" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "neoèekivano ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "neoèekivano }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "oèekivan znak ? u izrazu" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 #, fuzzy msgid "{ expected after ? in expression" msgstr "{ oèekivano posle ? u izrazu" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "} oèekivano u izrazu" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "oèekivano : praæeno ? podizrazom" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 #, fuzzy msgid "{ expected after : in expression" msgstr "{ oèekivano posle : u izrazu" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "| oèekivano na kraju izraza" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "(nepoznat tip)" diff --git a/po/sv.po b/po/sv.po index 0818374c6..b7b815639 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "JA" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 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:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paket %s är redan installerat" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-s (cachad)\n" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s JA (rpmlib tillhandahåller)\n" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s JA (db-filer)\n" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s JA (db-tillhandahållande)\n" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s JA (db-paket)\n" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NEJ\n" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) tillagt till beroendecachen.\n" @@ -1512,54 +1512,54 @@ msgstr "%s: (%s, %s) tillagt till beroendecachen.\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, 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:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "paket %s står i konflikt: %s\n" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, 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:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "========== noterar alla relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== tsort:erar paket (ordning, #föregångare, #efterföljare, djup)\n" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "========== endast efterföljare (presentationsordning)\n" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "LOOP:\n" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "========== fortsätter med tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "(inte ett tal)" @@ -1653,88 +1653,88 @@ msgstr "%s skapades som %s\n" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE antal måste vara 1.\n" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "Datatyp %d stöds inte\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "{ fattas efter %" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "} fattas efter %{" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "tomt taggformat" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "tomt taggnamn" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "okänd tagg" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "] förväntades vid slutet på vektor" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "oväntad ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "oväntad }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "? förväntades i uttryck" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "{ förväntades efter ? i uttryck" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "} förväntades i uttryck" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr ": förväntades efter ? i deluttryck" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "{ förväntades efter : i uttryck" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "| förväntades vid slutet på uttryck" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "(okänd typ)" diff --git a/po/tr.po b/po/tr.po index 1c0624405..6a9d31be4 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "EVET" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 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:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "%s zaten kurulu" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-s (arabellekli)\n" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s EVET (rpmrc saðlar)\n" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s EVET (rpmlib saðlar)\n" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s EVET (db dosyalarý)\n" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s EVET (db saðlar)\n" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s EVET (db paketi)\n" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s HAYIR\n" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) Baðýmlýlar alanýna eklendi.\n" @@ -1532,54 +1532,54 @@ msgstr "%s: (%s, %s) Ba #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, 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:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "%s paketi çeliþiyor: %s\n" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, 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:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "========== tsort baðýntýlarý kaydediliyor\n" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== paketler tsort'lanýyor (sýra, #öncüller, #ardýllar, derinlik)\n" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "========== sadece ardýllar (sunum sýrasý)\n" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "ÇEVRÝM:\n" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "========== tsort sürüyor ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "(bir sayý deðil)" @@ -1673,88 +1673,88 @@ msgstr "%s %s olarak olu #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE sayýsý 1 olmalý.\n" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "%d veri türü desteklenmiyor\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "%% den sonraki { yok" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "%%{ den sonraki } yok" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "etiket biçemi boþ" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "etiket ismi boþ" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "bilinmeyen etiket" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "dizinin sonunda ] gerekli" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "beklenmeyen ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "beklenmeyen }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "ifade içerisinde ? gerekli" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "ifade içerisinde ? dan sonra { gerekli" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "ifade içinde } gerekli" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "? alt ifadesinden sonra : gerekli" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "ifade içersinde : den sonra { gerekli" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "ifadenin sonunda | gerekli" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "(bilinmeyen tür)" diff --git a/po/uk.po b/po/uk.po index 5190ae95a..c7a373d18 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,53 +1494,53 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "" @@ -1631,88 +1631,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "" diff --git a/po/wa.po b/po/wa.po index 5190ae95a..c7a373d18 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,53 +1494,53 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "" @@ -1631,88 +1631,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "" diff --git a/po/zh.po b/po/zh.po index 5190ae95a..c7a373d18 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,53 +1494,53 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "" @@ -1631,88 +1631,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 5190ae95a..c7a373d18 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 14:59-0500\n" +"POT-Creation-Date: 2001-11-01 17:49-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:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "YES" msgstr "" -#: lib/depends.c:213 lib/depends.c:796 lib/depends.c:928 +#: lib/depends.c:213 lib/depends.c:887 lib/depends.c:1019 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:547 +#: lib/depends.c:590 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:552 +#: lib/depends.c:595 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:557 +#: lib/depends.c:600 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:795 +#: lib/depends.c:886 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:824 +#: lib/depends.c:915 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:841 +#: lib/depends.c:932 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:864 +#: lib/depends.c:955 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:877 +#: lib/depends.c:968 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:891 +#: lib/depends.c:982 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:998 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:928 +#: lib/depends.c:1019 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,53 +1494,53 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:994 +#: lib/depends.c:1085 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1074 +#: lib/depends.c:1172 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1330 +#: lib/depends.c:1428 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1581 +#: lib/depends.c:1683 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1668 +#: lib/depends.c:1770 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1744 +#: lib/depends.c:1852 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1830 +#: lib/depends.c:1938 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1864 +#: lib/depends.c:1972 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1869 +#: lib/depends.c:1977 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2958 lib/header.c:2979 lib/header.c:3001 +#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 msgid "(not a number)" msgstr "" @@ -1631,88 +1631,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:342 +#: lib/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:379 lib/header_internal.c:161 lib/psm.c:949 +#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:949 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2215 +#: lib/header.c:2219 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2245 +#: lib/header.c:2249 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2259 +#: lib/header.c:2263 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2273 +#: lib/header.c:2277 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2290 +#: lib/header.c:2294 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2317 +#: lib/header.c:2321 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2335 +#: lib/header.c:2339 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2343 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2405 +#: lib/header.c:2409 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2414 +#: lib/header.c:2418 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2427 lib/header.c:2469 +#: lib/header.c:2431 lib/header.c:2473 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2437 +#: lib/header.c:2441 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2454 +#: lib/header.c:2458 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2479 +#: lib/header.c:2483 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2702 +#: lib/header.c:2706 msgid "(unknown type)" msgstr "" diff --git a/rpm.spec b/rpm.spec index 5388dfed9..323f9c17d 100644 --- a/rpm.spec +++ b/rpm.spec @@ -547,3 +547,4 @@ fi - add some dinky availablePackage methods. - transaction.c: cleanly uncouple availablePackage from TFI_t. - add header refcount annotations throughout. +- depends.c: availablePackage is (almost) opaque. diff --git a/rpm.spec.in b/rpm.spec.in index f8cdc8850..678dd73b6 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -547,3 +547,4 @@ fi - add some dinky availablePackage methods. - transaction.c: cleanly uncouple availablePackage from TFI_t. - add header refcount annotations throughout. +- depends.c: availablePackage is (almost) opaque.