diff options
-rw-r--r-- | CHANGES | 6 | ||||
-rw-r--r-- | build.c | 42 | ||||
-rw-r--r-- | build/pack.c | 14 | ||||
-rw-r--r-- | lib/Makefile.am | 3 | ||||
-rw-r--r-- | lib/depends.c | 390 | ||||
-rw-r--r-- | lib/depends.h | 39 | ||||
-rw-r--r-- | lib/header_internal.h | 2 | ||||
-rw-r--r-- | lib/package.c | 2 | ||||
-rw-r--r-- | lib/psm.c | 21 | ||||
-rw-r--r-- | lib/query.c | 42 | ||||
-rw-r--r-- | lib/rpmchecksig.c | 10 | ||||
-rw-r--r-- | lib/rpminstall.c | 71 | ||||
-rw-r--r-- | lib/rpmlib.h | 77 | ||||
-rw-r--r-- | lib/transaction.c | 30 | ||||
-rw-r--r-- | lib/ts.c | 372 | ||||
-rw-r--r-- | lib/verify.c | 21 | ||||
-rw-r--r-- | po/cs.po | 311 | ||||
-rw-r--r-- | po/da.po | 311 | ||||
-rw-r--r-- | po/de.po | 313 | ||||
-rw-r--r-- | po/en_RN.po | 305 | ||||
-rw-r--r-- | po/es.po | 305 | ||||
-rw-r--r-- | po/eu_ES.po | 305 | ||||
-rw-r--r-- | po/fi.po | 313 | ||||
-rw-r--r-- | po/fr.po | 309 | ||||
-rw-r--r-- | po/gl.po | 305 | ||||
-rw-r--r-- | po/hu.po | 305 | ||||
-rw-r--r-- | po/id.po | 305 | ||||
-rw-r--r-- | po/is.po | 311 | ||||
-rw-r--r-- | po/it.po | 305 | ||||
-rw-r--r-- | po/ja.po | 313 | ||||
-rw-r--r-- | po/ko.po | 311 | ||||
-rw-r--r-- | po/no.po | 311 | ||||
-rw-r--r-- | po/pl.po | 312 | ||||
-rw-r--r-- | po/pt.po | 311 | ||||
-rw-r--r-- | po/pt_BR.po | 313 | ||||
-rw-r--r-- | po/ro.po | 305 | ||||
-rw-r--r-- | po/rpm.pot | 305 | ||||
-rw-r--r-- | po/ru.po | 311 | ||||
-rw-r--r-- | po/sk.po | 312 | ||||
-rw-r--r-- | po/sl.po | 314 | ||||
-rw-r--r-- | po/sr.po | 313 | ||||
-rw-r--r-- | po/sv.po | 311 | ||||
-rw-r--r-- | po/tr.po | 311 | ||||
-rw-r--r-- | po/uk.po | 305 | ||||
-rw-r--r-- | po/wa.po | 305 | ||||
-rw-r--r-- | po/zh.po | 305 | ||||
-rw-r--r-- | po/zh_CN.GB2312.po | 305 | ||||
-rw-r--r-- | python/rpmmodule.c | 7 | ||||
-rw-r--r-- | rpm.spec | 6 | ||||
-rw-r--r-- | rpm.spec.in | 6 | ||||
-rw-r--r-- | rpm2cpio.c | 12 | ||||
-rw-r--r-- | rpmdb/db1.c | 2 | ||||
-rw-r--r-- | rpmdb/db3.c | 2 | ||||
-rw-r--r-- | rpmdb/dbconfig.c | 8 | ||||
-rw-r--r-- | rpmdb/rpmdb.c | 49 | ||||
-rw-r--r-- | rpmdb/rpmdb.h | 19 | ||||
-rw-r--r-- | rpmio/rpmmessages.h | 3 | ||||
-rwxr-xr-x | rpmqv.c | 13 | ||||
-rw-r--r-- | tools/rpmsort.c | 15 |
59 files changed, 5865 insertions, 4995 deletions
@@ -21,7 +21,11 @@ - wire transactions through rpmcli signature modes. - wire transactions through rpmcli query/verify modes. - wire transactions through rpmcli install/erase modes. - - legacy signatures always checked on package read. + - legacy signatures always checked (where possible) on package read. + - wire transactions through rpmcli build modes. + - lazy rpmdb open/close through transaction methods (mostly anyways). + - no-brainer refcounts for rpmdb object. + - check added header against transaction set, replace if newer. 4.0.3 -> 4.0.4: @@ -16,30 +16,18 @@ /** */ -static int checkSpec(Header h) - /*@globals rpmGlobalMacroContext, fileSystem @*/ - /*@modifies h, rpmGlobalMacroContext, fileSystem @*/ +static int checkSpec(rpmTransactionSet ts, Header h) + /*@globals fileSystem @*/ + /*@modifies ts, h, fileSystem @*/ { - const char * rootdir = NULL; - rpmdb db = NULL; - int mode = O_RDONLY; - rpmTransactionSet ts; rpmDependencyConflict conflicts; int numConflicts; int rc; - if (!headerIsEntry(h, RPMTAG_REQUIREFLAGS)) + if (!headerIsEntry(h, RPMTAG_REQUIRENAME) + && !headerIsEntry(h, RPMTAG_CONFLICTNAME)) return 0; - if (rpmdbOpen(rootdir, &db, mode, 0644)) { - const char * dn; - dn = rpmGetPath( (rootdir ? rootdir : ""), "%{_dbpath}", NULL); - rpmError(RPMERR_OPEN, _("cannot open rpm database in %s\n"), dn); - dn = _free(dn); - exit(EXIT_FAILURE); - } - ts = rpmtransCreateSet(db, rootdir); - rc = rpmtransAddPackage(ts, h, NULL, NULL, 0, NULL); rc = rpmdepCheck(ts, &conflicts, &numConflicts); @@ -52,10 +40,6 @@ static int checkSpec(Header h) } /*@=branchstate@*/ - ts = rpmtransFree(ts); - if (db != NULL) - (void) rpmdbClose(db); - return rc; } @@ -105,10 +89,10 @@ static int isSpecFile(const char * specfile) /** */ -static int buildForTarget(const char * arg, BTA_t ba) +static int buildForTarget(rpmTransactionSet ts, const char * arg, BTA_t ba) /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/ - /*@modifies rpmGlobalMacroContext, fileSystem, internalState @*/ + /*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/ { const char * passPhrase = ba->passPhrase; const char * cookie = ba->cookie; @@ -276,7 +260,7 @@ static int buildForTarget(const char * arg, BTA_t ba) initSourceHeader(spec); /* Check build prerequisites */ - if (!ba->noDeps && checkSpec(spec->sourceHeader)) { + if (!ba->noDeps && checkSpec(ts, spec->sourceHeader)) { rc = 1; goto exit; } @@ -298,14 +282,17 @@ exit: int build(const char * arg, BTA_t ba, const char * rcfile) { + rpmTransactionSet ts; char *t, *te; int rc = 0; char * targets = ba->targets; #define buildCleanMask (RPMBUILD_RMSOURCE|RPMBUILD_RMSPEC) int cleanFlags = ba->buildAmount & buildCleanMask; + ts = rpmtransCreateSet(NULL, NULL); + if (targets == NULL) { - rc = buildForTarget(arg, ba); + rc = buildForTarget(ts, arg, ba); goto exit; } @@ -331,7 +318,7 @@ int build(const char * arg, BTA_t ba, const char * rcfile) /* Read in configuration for target. */ rpmFreeMacros(NULL); (void) rpmReadConfigFiles(rcfile, target); - rc = buildForTarget(arg, ba); + rc = buildForTarget(ts, arg, ba); if (rc) break; } @@ -340,5 +327,8 @@ exit: /* Restore original configuration. */ rpmFreeMacros(NULL); (void) rpmReadConfigFiles(rcfile, NULL); + + ts = rpmtransFree(ts); + return rc; } diff --git a/build/pack.c b/build/pack.c index 285d1ba93..a06dc4006 100644 --- a/build/pack.c +++ b/build/pack.c @@ -50,9 +50,7 @@ static int cpio_doio(FD_t fdo, /*@unused@*/ Header h, CSA_t csa, fileSystem@*/ /*@modifies fdo, csa, rpmGlobalMacroContext, fileSystem @*/ { - const char * rootDir = "/"; - rpmdb rpmdb = NULL; - rpmTransactionSet ts = rpmtransCreateSet(rpmdb, rootDir); + rpmTransactionSet ts = rpmtransCreateSet(NULL, NULL); TFI_t fi = csa->cpioList; const char *failedFile = NULL; FD_t cfd; @@ -317,19 +315,13 @@ int readRPM(const char *fileName, Spec *specp, struct rpmlead *lead, spec->packages->header = headerFree(spec->packages->header); /* Read the rpm lead, signatures, and header */ - { const char * rootDir = ""; - rpmdb db = NULL; - rpmTransactionSet ts = rpmtransCreateSet(db, rootDir); - int xx; + { rpmTransactionSet ts = rpmtransCreateSet(NULL, NULL); - ts->need_payload = 1; /* XXX W2DO? pass fileName? */ /*@-mustmod@*/ /* LCL: segfault */ - xx = rpmReadPackageFile(ts, fdi, "readRPM", + rc = rpmReadPackageFile(ts, fdi, "readRPM", &spec->packages->header); /*@=mustmod@*/ - ts->need_payload = 0; - rc = (xx ? RPMRC_FAIL : RPMRC_OK); /* XXX HACK */ ts = rpmtransFree(ts); diff --git a/lib/Makefile.am b/lib/Makefile.am index a5c4d61d9..b0fa3a0c8 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -93,5 +93,8 @@ th: th.c librpm.la trb: trb.o librpm.la $(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ trb.o $(mylibs) $(LIBS) +ts: ts.o librpm.la + $(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ ts.o $(mylibs) $(LIBS) + trhn: trhn.o librpm.la $(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ trhn.o $(mylibs) $(LIBS) diff --git a/lib/depends.c b/lib/depends.c index 635287c31..bc7508724 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -5,6 +5,7 @@ #include "system.h" #include <rpmlib.h> +#include <rpmmacro.h> /* XXX rpmGetPath */ #include <rpmpgp.h> /* XXX pgpFreeDig */ #include "depends.h" @@ -23,6 +24,9 @@ /*@access availableList@*/ /*@unchecked@*/ +static int _debug = 0; + +/*@unchecked@*/ static int _cacheDependsRC = 1; /** @@ -205,8 +209,109 @@ static int dirInfoCompare(const void * one, const void * two) /*@*/ } /** + * Delete package from available list. + * @param al available list + * @param pkgNnum package index + */ +static void +alDelPackage(availableList al, int pkgNum) + /*@modifies al @*/ +{ + HGE_t hge = (HGE_t)headerGetEntryMinMemory; + HFD_t hfd = headerFreeData; + struct availablePackage * p; + + /*@-nullptrarith@*/ /* FIX: al->list might be NULL */ + p = al->list + pkgNum; + /*@=nullptrarith@*/ + +/*@-modfilesys@*/ +if (_debug) +fprintf(stderr, "*** del %p[%d] %s-%s-%s\n", al->list, pkgNum, p->name, p->version, p->release); +/*@=modfilesys@*/ + + if (p->relocs) { + rpmRelocation * r; + for (r = p->relocs; r->oldPath || r->newPath; r++) { + r->oldPath = _free(r->oldPath); + r->newPath = _free(r->newPath); + } + p->relocs = _free(p->relocs); + } + if (p->fd) { + /*@-type@*/ /* FIX: cast? */ + (void) fdFree(p->fd, "alDelPackage"); + /*@=type@*/ + p->fd = NULL; + } + + if (p->baseNames != NULL && p->filesCount > 0) { + int origNumDirs = al->numDirs; + const char ** dirNames; + int_32 numDirs; + rpmTagType dnt; + int dirNum; + struct dirInfo_s dirNeedle; + dirInfo dirMatch; + int last; + int i, xx; + + xx = hge(p->h, RPMTAG_DIRNAMES, &dnt, (void **) &dirNames, &numDirs); + + /* XXX FIXME: We ought to relocate the directory list here */ + + if (al->dirs != NULL) + for (dirNum = al->numDirs - 1; dirNum >= 0; dirNum--) { + dirNeedle.dirName = (char *) dirNames[dirNum]; + dirNeedle.dirNameLen = strlen(dirNames[dirNum]); + dirMatch = bsearch(&dirNeedle, al->dirs, al->numDirs, + sizeof(dirNeedle), dirInfoCompare); + if (dirMatch == NULL) + continue; + last = dirMatch->numFiles; + for (i = dirMatch->numFiles - 1; i >= 0; i--) { + if (dirMatch->files[i].pkgNum != pkgNum) + /*@innercontinue@*/ continue; + dirMatch->numFiles--; + if (i > dirMatch->numFiles) + /*@innercontinue@*/ continue; + memmove(dirMatch->files, dirMatch->files+1, + (dirMatch->numFiles - i)); + } + if (dirMatch->numFiles > 0) { + if (last > i) + dirMatch->files = xrealloc(dirMatch->files, + dirMatch->numFiles * sizeof(*dirMatch->files)); + continue; + } + dirMatch->files = _free(dirMatch->files); + dirMatch->dirName = _free(dirMatch->dirName); + al->numDirs--; + if (dirNum > al->numDirs) + continue; + memmove(dirMatch, dirMatch+1, (al->numDirs - dirNum)); + } + + if (origNumDirs > al->numDirs) { + if (al->numDirs > 0) + al->dirs = xrealloc(al->dirs, al->numDirs * sizeof(*al->dirs)); + else + al->dirs = _free(al->dirs); + } + + dirNames = hfd(dirNames, dnt); + } + p->h = headerFree(p->h); + memset(p, 0, sizeof(*p)); + /*@-nullstate@*/ /* FIX: al->list->h may be NULL */ + return; + /*@=nullstate@*/ +} + +/** * Add package to available list. * @param al available list + * @param pkgNnum package index, < 0 to force an append * @param h package header * @param key package private data * @param fd package file handle @@ -214,7 +319,7 @@ static int dirInfoCompare(const void * one, const void * two) /*@*/ * @return available package pointer */ static /*@exposed@*/ struct availablePackage * -alAddPackage(availableList al, +alAddPackage(availableList al, int pkgNum, Header h, /*@null@*/ /*@dependent@*/ const void * key, /*@null@*/ FD_t fd, /*@null@*/ rpmRelocation * relocs) /*@modifies al, h @*/ @@ -223,28 +328,22 @@ alAddPackage(availableList al, HFD_t hfd = headerFreeData; rpmTagType dnt, bnt; struct availablePackage * p; - rpmRelocation * r; int i, xx; - int_32 * dirIndexes; - const char ** dirNames; - int numDirs, dirNum; - int * dirMapping; - struct dirInfo_s dirNeedle; - dirInfo dirMatch; - int first, last, fileNum; - int origNumDirs; - int pkgNum; uint_32 multiLibMask = 0; - uint_32 * fileFlags = NULL; uint_32 * pp = NULL; - if (al->size == al->alloced) { - al->alloced += al->delta; - al->list = xrealloc(al->list, sizeof(*al->list) * al->alloced); + if (pkgNum >= 0 && pkgNum < al->size) { + alDelPackage(al, pkgNum); + } else { + if (al->size == al->alloced) { + al->alloced += al->delta; + al->list = xrealloc(al->list, sizeof(*al->list) * al->alloced); + } + pkgNum = al->size++; } - pkgNum = al->size++; p = al->list + pkgNum; + p->h = headerLink(h); /* XXX reference held by transaction set */ p->depth = p->npreds = 0; memset(&p->tsi, 0, sizeof(p->tsi)); @@ -252,6 +351,11 @@ alAddPackage(availableList al, xx = headerNVR(p->h, &p->name, &p->version, &p->release); +/*@-modfilesys@*/ +if (_debug) +fprintf(stderr, "*** add %p[%d] %s-%s-%s\n", al->list, pkgNum, p->name, p->version, p->release); +/*@=modfilesys@*/ + /* 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. @@ -274,7 +378,8 @@ alAddPackage(availableList al, p->epoch = NULL; if (!hge(h, RPMTAG_PROVIDENAME, NULL, (void **) &p->provides, - &p->providesCount)) { + &p->providesCount)) + { p->providesCount = 0; p->provides = NULL; p->providesEVR = NULL; @@ -308,6 +413,16 @@ alAddPackage(availableList al, p->filesCount = 0; p->baseNames = NULL; } else { + int_32 * dirIndexes; + const char ** dirNames; + int_32 numDirs; + uint_32 * fileFlags = NULL; + int * dirMapping; + struct dirInfo_s dirNeedle; + dirInfo dirMatch; + int first, last, fileNum, dirNum; + int origNumDirs; + xx = hge(h, RPMTAG_DIRNAMES, &dnt, (void **) &dirNames, &numDirs); xx = hge(h, RPMTAG_DIRINDEXES, NULL, (void **) &dirIndexes, NULL); xx = hge(h, RPMTAG_FILEFLAGS, NULL, (void **) &fileFlags, NULL); @@ -318,8 +433,8 @@ alAddPackage(availableList al, /* allocated enough space for all the directories we could possible need to add */ - al->dirs = xrealloc(al->dirs, - sizeof(*al->dirs) * (al->numDirs + numDirs)); + al->dirs = xrealloc(al->dirs, + (al->numDirs + numDirs) * sizeof(*al->dirs)); origNumDirs = al->numDirs; for (dirNum = 0; dirNum < numDirs; dirNum++) { @@ -331,29 +446,27 @@ alAddPackage(availableList al, dirMapping[dirNum] = dirMatch - al->dirs; } else { dirMapping[dirNum] = al->numDirs; - al->dirs[al->numDirs].dirName = xstrdup(dirNames[dirNum]); - al->dirs[al->numDirs].dirNameLen = strlen(dirNames[dirNum]); - al->dirs[al->numDirs].files = NULL; - al->dirs[al->numDirs].numFiles = 0; + dirMatch = al->dirs + al->numDirs; + dirMatch->dirName = xstrdup(dirNames[dirNum]); + dirMatch->dirNameLen = strlen(dirNames[dirNum]); + dirMatch->files = NULL; + dirMatch->numFiles = 0; al->numDirs++; } } dirNames = hfd(dirNames, dnt); - first = 0; - while (first < p->filesCount) { - last = first; - while ((last + 1) < p->filesCount) { + for (first = 0; first < p->filesCount; first = last + 1) { + for (last = first; (last + 1) < p->filesCount; last++) { if (dirIndexes[first] != dirIndexes[last + 1]) /*@innerbreak@*/ break; - last++; } dirMatch = al->dirs + dirMapping[dirIndexes[first]]; dirMatch->files = xrealloc(dirMatch->files, - sizeof(*dirMatch->files) * - (dirMatch->numFiles + last - first + 1)); + (dirMatch->numFiles + last - first + 1) * + sizeof(*dirMatch->files)); if (p->baseNames != NULL) /* XXX can't happen */ for (fileNum = first; fileNum <= last; fileNum++) { dirMatch->files[dirMatch->numFiles].baseName = @@ -363,8 +476,6 @@ alAddPackage(availableList al, fileFlags[fileNum]; dirMatch->numFiles++; } - - first = last + 1; } if (origNumDirs + al->numDirs) @@ -378,6 +489,8 @@ alAddPackage(availableList al, /*@=type@*/ if (relocs) { + rpmRelocation * r; + for (i = 0, r = relocs; r->oldPath || r->newPath; i++, r++) {}; p->relocs = xmalloc((i + 1) * sizeof(*p->relocs)); @@ -427,7 +540,7 @@ static void alMakeIndex(availableList al) if (ai->size || al->list == NULL) return; - for (i = 0; i < al->size; i++) + for (i = 0; i < al->size; i++) ai->size += al->list[i].providesCount; if (ai->size) { @@ -670,6 +783,48 @@ int headerMatchesDepFlags(Header h, return rpmRangesOverlap(name, pkgEVR, pkgFlags, reqName, reqEVR, reqFlags); } +/*@-modfilesystem@*/ +int rpmtsCloseDB(rpmTransactionSet ts) +{ + int rc = 0; + + if (ts->rpmdb != NULL) { + rc = rpmdbClose(ts->rpmdb); + ts->rpmdb = NULL; + } + return rc; +} + +int rpmtsOpenDB(rpmTransactionSet ts, int dbmode) +{ + int rc = 0; + + if (ts->rpmdb != NULL) { + if ((rc = rpmtsCloseDB(ts)) != 0) + return rc; + } + + ts->dbmode = dbmode; + rc = rpmdbOpen(ts->rootDir, &ts->rpmdb, ts->dbmode, 0644); + if (rc) { + const char * dn; + /*@-globs -mods@*/ /* FIX: rpmGlobalMacroContext */ + dn = rpmGetPath(ts->rootDir, "%{_dbpath}", NULL); + /*@=globs =mods@*/ + rpmMessage(RPMMESS_ERROR, + _("cannot open Packages database in %s\n"), dn); + dn = _free(dn); + } + return rc; +} + +rpmdbMatchIterator rpmtsInitIterator(const rpmTransactionSet ts, int rpmtag, + const void * keyp, size_t keylen) +{ + /*@-mods -onlytrans -type@*/ /* FIX: rpmdb excision */ + return rpmdbInitIterator(ts->rpmdb, rpmtag, keyp, keylen); + /*@=mods =onlytrans =type@*/ +} rpmTransactionSet rpmtransCreateSet(rpmdb db, const char * rootDir) { @@ -684,9 +839,15 @@ rpmTransactionSet rpmtransCreateSet(rpmdb db, const char * rootDir) ts->filesystemCount = 0; ts->filesystems = NULL; ts->di = NULL; - /*@-assignexpose@*/ - ts->rpmdb = db; - /*@=assignexpose@*/ + if (db != NULL) { + /*@-assignexpose@*/ + ts->rpmdb = rpmdbLink(db); + /*@=assignexpose@*/ + ts->dbmode = db->db_mode; + } else { + ts->rpmdb = NULL; + ts->dbmode = O_RDONLY; + } ts->scriptFd = NULL; ts->id = (int_32) time(NULL); ts->delta = 5; @@ -707,7 +868,7 @@ rpmTransactionSet rpmtransCreateSet(rpmdb db, const char * rootDir) rootDir = t; } - ts->rootDir = xstrdup(rootDir); + ts->rootDir = (rootDir != NULL ? xstrdup(rootDir) : xstrdup("")); ts->currDir = NULL; ts->chrootDone = 0; @@ -782,63 +943,116 @@ static int removePackage(rpmTransactionSet ts, int dboffset, int depends) return 0; } +static /*@only@*/ const char * hNVRstr(Header h, /*@out@*/ const char ** np ) + /*@modifies *np @*/ +{ + const char * NVR, * n, * v, * r; + char * t; + + (void) headerNVR(h, &n, &v, &r); + NVR = t = xcalloc(1, strlen(n) + strlen(v) + strlen(r) + sizeof("--")); + t = stpcpy(t, n); + t = stpcpy(t, "-"); + t = stpcpy(t, v); + t = stpcpy(t, "-"); + t = stpcpy(t, r); + if (np) + *np = n; + return NVR; +} + int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd, const void * key, int upgrade, rpmRelocation * relocs) { HGE_t hge = (HGE_t)headerGetEntryMinMemory; HFD_t hfd = headerFreeData; + const char * name = NULL; + const char * addNVR = hNVRstr(h, &name); + const char * pkgNVR = NULL; rpmTagType ont, ovt; - /* this is an install followed by uninstalls */ - const char * name; + struct availablePackage * p; int count; const char ** obsoletes; int alNum; int xx; + int ec = 0; + int rc; + int i = ts->orderCount; /* - * FIXME: handling upgrades like this is *almost* okay. It doesn't - * check to make sure we're upgrading to a newer version, and it - * makes it difficult to generate a return code based on the number of - * packages which failed. + * Check for previously added versions with the same name. */ - if (ts->orderCount == ts->orderAlloced) { + i = ts->orderCount; + if (ts->addedPackages.list != NULL) + for (i = 0; i < ts->orderCount; i++) { + p = ts->addedPackages.list + i; + if (strcmp(p->name, name)) + continue; + rc = rpmVersionCompare(p->h, h); + pkgNVR = hNVRstr(p->h, NULL); + if (rc > 0) { + rpmMessage(RPMMESS_WARNING, + _("newer package %s already added, skipping %s\n"), + pkgNVR, addNVR); + goto exit; + } else if (rc == 0) { + rpmMessage(RPMMESS_WARNING, + _("package %s already added, ignoring\n"), + pkgNVR); + goto exit; + } else { + rpmMessage(RPMMESS_WARNING, + _("older package %s already added, replacing with %s\n"), + pkgNVR, addNVR); + } + break; + } + + /* XXX i == ts->orderCount most of the time. */ + + if (i == ts->orderAlloced) { ts->orderAlloced += ts->delta; - ts->order = xrealloc(ts->order, sizeof(*ts->order) * ts->orderAlloced); + ts->order = xrealloc(ts->order, ts->orderAlloced * sizeof(*ts->order)); } - ts->order[ts->orderCount].type = TR_ADDED; + ts->order[i].type = TR_ADDED; if (ts->addedPackages.list == NULL) - return 0; + goto exit; - alNum = alAddPackage(&ts->addedPackages, h, key, fd, relocs) - + alNum = alAddPackage(&ts->addedPackages, i, h, key, fd, relocs) - ts->addedPackages.list; - ts->order[ts->orderCount++].u.addedIndex = alNum; + ts->order[i].u.addedIndex = alNum; - /*@-branchstate@*/ - if (!upgrade || ts->rpmdb == NULL) - return 0; - /*@=branchstate@*/ + if (i == ts->orderCount) + ts->orderCount++; + + if (!upgrade) + goto exit; /* XXX binary rpms always have RPMTAG_SOURCERPM, source rpms do not */ if (headerIsEntry(h, RPMTAG_SOURCEPACKAGE)) - return 0; + goto exit; - xx = headerNVR(h, &name, NULL, NULL); + /* Do lazy, readonly, open of rpm database. */ + if (ts->rpmdb == NULL) { + if ((ec = rpmtsOpenDB(ts, ts->dbmode)) != 0) + goto exit; + } { rpmdbMatchIterator mi; Header h2; - mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_NAME, name, 0); + mi = rpmtsInitIterator(ts, RPMTAG_NAME, name, 0); while((h2 = rpmdbNextIterator(mi)) != NULL) { /*@-branchstate@*/ if (rpmVersionCompare(h, h2)) xx = removePackage(ts, rpmdbGetIteratorOffset(mi), alNum); else { - uint_32 *p, multiLibMask = 0, oldmultiLibMask = 0; + uint_32 *pp, multiLibMask = 0, oldmultiLibMask = 0; - if (hge(h2, RPMTAG_MULTILIBS, NULL, (void **) &p, NULL)) - oldmultiLibMask = *p; - if (hge(h, RPMTAG_MULTILIBS, NULL, (void **) &p, NULL)) - multiLibMask = *p; + if (hge(h2, RPMTAG_MULTILIBS, NULL, (void **) &pp, NULL)) + oldmultiLibMask = *pp; + if (hge(h, RPMTAG_MULTILIBS, NULL, (void **) &pp, NULL)) + multiLibMask = *pp; if (oldmultiLibMask && multiLibMask && !(oldmultiLibMask & multiLibMask)) { ts->addedPackages.list[alNum].multiLib = multiLibMask; @@ -868,7 +1082,7 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd, { rpmdbMatchIterator mi; Header h2; - mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_NAME, obsoletes[j], 0); + mi = rpmtsInitIterator(ts, RPMTAG_NAME, obsoletes[j], 0); xx = rpmdbPruneIterator(mi, ts->removedPackages, ts->numRemovedPackages, 1); @@ -894,14 +1108,18 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd, obsoletesEVR = hfd(obsoletesEVR, ovt); obsoletes = hfd(obsoletes, ont); } + ec = 0; - return 0; +exit: + pkgNVR = _free(pkgNVR); + addNVR = _free(addNVR); + return ec; } void rpmtransAvailablePackage(rpmTransactionSet ts, Header h, const void * key) { struct availablePackage * al; - al = alAddPackage(&ts->availablePackages, h, key, NULL, NULL); + al = alAddPackage(&ts->availablePackages, -1, h, key, NULL, NULL); } int rpmtransRemovePackage(rpmTransactionSet ts, int dboffset) @@ -942,13 +1160,7 @@ rpmTransactionSet rpmtransFree(rpmTransactionSet ts) rpmtransClean(ts); - if (ts->rpmdb) { - int xx; - /*@-kepttrans@*/ - xx = rpmdbClose(ts->rpmdb); - ts->rpmdb = NULL; - /*@=kepttrans@*/ - } + (void) rpmtsCloseDB(ts); ts = _free(ts); } @@ -1310,7 +1522,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts, if (*keyName == '/') { /* keyFlags better be 0! */ - mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_BASENAMES, keyName, 0); + mi = rpmtsInitIterator(ts, RPMTAG_BASENAMES, keyName, 0); (void) rpmdbPruneIterator(mi, ts->removedPackages, ts->numRemovedPackages, 1); @@ -1324,7 +1536,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts, mi = rpmdbFreeIterator(mi); } - mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_PROVIDENAME, keyName, 0); + mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, keyName, 0); (void) rpmdbPruneIterator(mi, ts->removedPackages, ts->numRemovedPackages, 1); while ((h = rpmdbNextIterator(mi)) != NULL) { @@ -1338,7 +1550,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts, mi = rpmdbFreeIterator(mi); #if defined(DYING) || defined(__LCLINT__) - mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_NAME, keyName, 0); + mi = rpmtsInitIterator(ts, RPMTAG_NAME, keyName, 0); (void) rpmdbPruneIterator(mi, ts->removedPackages, ts->numRemovedPackages, 1); while ((h = rpmdbNextIterator(mi)) != NULL) { @@ -1617,7 +1829,7 @@ static int checkDependentPackages(rpmTransactionSet ts, /*@modifies ts, psp, fileSystem @*/ { rpmdbMatchIterator mi; - mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_REQUIRENAME, key, 0); + mi = rpmtsInitIterator(ts, RPMTAG_REQUIRENAME, key, 0); return checkPackageSet(ts, psp, key, mi); } @@ -1637,7 +1849,7 @@ static int checkDependentConflicts(rpmTransactionSet ts, if (ts->rpmdb) { /* XXX is this necessary? */ rpmdbMatchIterator mi; - mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_CONFLICTNAME, key, 0); + mi = rpmtsInitIterator(ts, RPMTAG_CONFLICTNAME, key, 0); rc = checkPackageSet(ts, psp, key, mi); } @@ -1680,7 +1892,7 @@ static struct badDeps_s { { "pam", "pamconfig" }, { NULL, NULL } }; - + static int ignoreDep(const struct availablePackage * p, const struct availablePackage * q) /*@*/ @@ -2227,11 +2439,19 @@ int rpmdepCheck(rpmTransactionSet ts, rpmdbMatchIterator mi = NULL; Header h = NULL; struct availablePackage * p; - problemsSet ps; + problemsSet ps = NULL; int npkgs; + int closeatexit = 0; int i, j, xx; int rc; + /* Do lazy, readonly, open of rpm database. */ + if (ts->rpmdb == NULL) { + if ((rc = rpmtsOpenDB(ts, ts->dbmode)) != 0) + goto exit; + closeatexit = 1; + } + npkgs = ts->addedPackages.size; ps = xcalloc(1, sizeof(*ps)); @@ -2284,7 +2504,7 @@ int rpmdepCheck(rpmTransactionSet ts, */ /*@-branchstate@*/ if (ts->numRemovedPackages > 0) { - mi = rpmdbInitIterator(ts->rpmdb, RPMDBI_PACKAGES, NULL, 0); + mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, NULL, 0); xx = rpmdbAppendIterator(mi, ts->removedPackages, ts->numRemovedPackages); while ((h = rpmdbNextIterator(mi)) != NULL) { @@ -2336,7 +2556,7 @@ int rpmdepCheck(rpmTransactionSet ts, NULL); rc = 0; for (j = 0; j < fileCount; j++) { - len = strlen(baseNames[j]) + 1 + + len = strlen(baseNames[j]) + 1 + strlen(dirNames[dirIndexes[j]]); if (len > fileAlloced) { fileAlloced = len * 2; @@ -2373,10 +2593,14 @@ int rpmdepCheck(rpmTransactionSet ts, exit: mi = rpmdbFreeIterator(mi); - ps->problems = _free(ps->problems); - ps = _free(ps); + if (ps) { + ps->problems = _free(ps->problems); + ps = _free(ps); + } /*@-branchstate@*/ - if (_cacheDependsRC) + if (closeatexit) + xx = rpmtsCloseDB(ts); + else if (_cacheDependsRC) xx = rpmdbCloseDBI(ts->rpmdb, RPMDBI_DEPENDS); /*@=branchstate@*/ return rc; diff --git a/lib/depends.h b/lib/depends.h index 0547b10dc..58d728771 100644 --- a/lib/depends.h +++ b/lib/depends.h @@ -130,20 +130,28 @@ struct transactionElement { * The set of packages to be installed/removed atomically. */ struct rpmTransactionSet_s { - rpmtransFlags transFlags; /*!< Bit(s) to control operation. */ -/*@null@*/ rpmCallbackFunction notify; /*!< Callback function. */ + rpmtransFlags transFlags; /*!< Bit(s) to control operation. */ /*@observer@*/ /*@null@*/ - rpmCallbackData notifyData; /*!< Callback private data. */ -/*@dependent@*/ 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. */ -/*@kept@*/ /*@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 allocedRemovedPackages; /*!< Size of removed packages array. */ + rpmCallbackFunction notify; /*!< Callback function. */ +/*@observer@*/ /*@null@*/ + rpmCallbackData notifyData; /*!< Callback private data. */ +/*@dependent@*/ + 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 allocedRemovedPackages; /*!< Size of removed packages array. */ struct availableList_s addedPackages; /*!< Set of packages being installed. */ struct availableList_s availablePackages; @@ -161,7 +169,7 @@ struct rpmTransactionSet_s { int delta; /*!< Delta for reallocation. */ int_32 id; /*!< Transaction id. */ - int need_payload; /*!< Leave fd positioned at payload? */ + int verify_legacy; /*!< Verify legacy signatures? */ /*@observer@*/ /*@dependent@*/ /*@null@*/ const char * fn; /*!< Current package fn. */ @@ -169,7 +177,8 @@ struct rpmTransactionSet_s { int_32 sigtype; /*!< Current package signature data type. */ /*@null@*/ const void * sig; /*!< Current package signature. */ int_32 siglen; /*!< Current package signature length. */ -/*@null@*/ struct pgpDig_s * dig;/*!< Current signature/pubkey parametrs. */ +/*@null@*/ + struct pgpDig_s * dig; /*!< Current signature/pubkey parametrs. */ } ; diff --git a/lib/header_internal.h b/lib/header_internal.h index 913b8730a..c6878f831 100644 --- a/lib/header_internal.h +++ b/lib/header_internal.h @@ -61,7 +61,7 @@ struct headerToken { #define HEADERFLAG_SORTED (1 << 0) /*!< Are header entries sorted? */ #define HEADERFLAG_ALLOCATED (1 << 1) /*!< Is 1st header region allocated? */ #define HEADERFLAG_LEGACY (1 << 2) /*!< Header came from legacy source? */ -/*@refs@*/ int nrefs; /*!< Reference count. */ +/*@refs@*/ int nrefs; /*!< Reference count. */ }; /** \ingroup header diff --git a/lib/package.c b/lib/package.c index 0dc889972..5706bb195 100644 --- a/lib/package.c +++ b/lib/package.c @@ -260,7 +260,7 @@ int rpmReadPackageFile(rpmTransactionSet ts, FD_t fd, goto exit; } - if (ts->need_payload) /* leave fd ready to install payload */ + if (!ts->verify_legacy) /* leave fd ready to install payload */ ts->sigtag = 0; else if (headerIsEntry(sig, RPMSIGTAG_GPG)) ts->sigtag = RPMSIGTAG_GPG; @@ -1064,9 +1064,9 @@ static int mergeFiles(TFI_t fi, Header h, Header newH) * @param psm package state machine data * @return 0 always */ -static int markReplacedFiles(PSM_t psm) +static int markReplacedFiles(const PSM_t psm) /*@globals fileSystem@*/ - /*@modifies psm, fileSystem @*/ + /*@modifies fileSystem @*/ { const rpmTransactionSet ts = psm->ts; TFI_t fi = psm->fi; @@ -1101,7 +1101,7 @@ static int markReplacedFiles(PSM_t psm) offsets[num++] = sfi->otherPkg; } - mi = rpmdbInitIterator(ts->rpmdb, RPMDBI_PACKAGES, NULL, 0); + mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, NULL, 0); xx = rpmdbAppendIterator(mi, offsets, num); xx = rpmdbSetIteratorRewrite(mi, 1); @@ -1196,7 +1196,7 @@ rpmRC rpmInstallSourcePackage(rpmTransactionSet ts, PSM_t psm = &psmbuf; int isSource; rpmRC rc; - int i, xx; + int i; /*@-mods -temptrans -assignexpose@*/ ts->notify = notify; @@ -1204,10 +1204,9 @@ rpmRC rpmInstallSourcePackage(rpmTransactionSet ts, /*@=mods =temptrans =assignexpose@*/ /*@-mustmod@*/ /* LCL: segfault */ - xx = rpmReadPackageFile(ts, fd, "InstallSourcePackage", &h); + rc = rpmReadPackageFile(ts, fd, "InstallSourcePackage", &h); /*@=mustmod@*/ - if (xx || h == NULL) { - rc = RPMRC_FAIL; /* XXX HACK */ + if (!(rc == RPMRC_OK || rc == RPMRC_BADSIZE) || h == NULL) { goto exit; } rc = RPMRC_OK; /* XXX HACK */ @@ -1823,7 +1822,7 @@ static int runTriggers(PSM_t psm) int countCorrection = psm->countCorrection; psm->countCorrection = 0; - mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_TRIGGERNAME, fi->name, 0); + mi = rpmtsInitIterator(ts, RPMTAG_TRIGGERNAME, fi->name, 0); while((triggeredH = rpmdbNextIterator(mi)) != NULL) { rc |= handleOneTrigger(psm, fi->h, triggeredH, numPackage, NULL); } @@ -1878,7 +1877,7 @@ static int runImmedTriggers(PSM_t psm) if (triggersRun[triggerIndices[i]] != 0) continue; - mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_NAME, triggerNames[i], 0); + mi = rpmtsInitIterator(ts, RPMTAG_NAME, triggerNames[i], 0); while((sourceH = rpmdbNextIterator(mi)) != NULL) { rc |= handleOneTrigger(psm, sourceH, fi->h, @@ -1974,7 +1973,7 @@ int psmStage(PSM_t psm, pkgStage stage) psm->scriptArg = psm->npkgs_installed + 1; assert(psm->mi == NULL); - psm->mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_NAME, fi->name, 0); + psm->mi = rpmtsInitIterator(ts, RPMTAG_NAME, fi->name, 0); xx = rpmdbSetIteratorRE(psm->mi, RPMTAG_VERSION, RPMMIRE_DEFAULT, fi->version); xx = rpmdbSetIteratorRE(psm->mi, RPMTAG_RELEASE, @@ -2556,7 +2555,7 @@ assert(psm->mi == NULL); case PSM_RPMDB_LOAD: assert(psm->mi == NULL); - psm->mi = rpmdbInitIterator(ts->rpmdb, RPMDBI_PACKAGES, + psm->mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, &fi->record, sizeof(fi->record)); fi->h = rpmdbNextIterator(psm->mi); diff --git a/lib/query.c b/lib/query.c index 58e745390..0ff13886d 100644 --- a/lib/query.c +++ b/lib/query.c @@ -604,11 +604,11 @@ restart: /*@loopbreak@*/ break; } + ts->verify_legacy = 1; /*@-mustmod@*/ /* LCL: something fishy here, was segfault */ - rc = rpmReadPackageFile(ts, fd, fileURL, &h); + rpmrc = rpmReadPackageFile(ts, fd, fileURL, &h); /*@=mustmod@*/ - rpmrc = (rc == 0 ? RPMRC_OK : RPMRC_BADMAGIC); - /* XXX rpmrc tests below need work */ + ts->verify_legacy = 0; (void) Fclose(fd); @@ -711,7 +711,7 @@ restart: } break; case RPMQV_ALL: - qva->qva_mi = rpmdbInitIterator(ts->rpmdb, RPMDBI_PACKAGES, NULL, 0); + qva->qva_mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, NULL, 0); if (qva->qva_mi == NULL) { rpmError(RPMERR_QUERYINFO, _("no packages\n")); res = 1; @@ -730,7 +730,7 @@ restart: break; case RPMQV_GROUP: - qva->qva_mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_GROUP, arg, 0); + qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_GROUP, arg, 0); if (qva->qva_mi == NULL) { rpmError(RPMERR_QUERYINFO, _("group %s does not contain any packages\n"), arg); @@ -741,7 +741,7 @@ restart: break; case RPMQV_TRIGGEREDBY: - qva->qva_mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_TRIGGERNAME, arg, 0); + qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_TRIGGERNAME, arg, 0); if (qva->qva_mi == NULL) { rpmError(RPMERR_QUERYINFO, _("no package triggers %s\n"), arg); res = 1; @@ -751,7 +751,7 @@ restart: break; case RPMQV_WHATREQUIRES: - qva->qva_mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_REQUIRENAME, arg, 0); + qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_REQUIRENAME, arg, 0); if (qva->qva_mi == NULL) { rpmError(RPMERR_QUERYINFO, _("no package requires %s\n"), arg); res = 1; @@ -762,7 +762,7 @@ restart: case RPMQV_WHATPROVIDES: if (arg[0] != '/') { - qva->qva_mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_PROVIDENAME, arg, 0); + qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, arg, 0); if (qva->qva_mi == NULL) { rpmError(RPMERR_QUERYINFO, _("no package provides %s\n"), arg); res = 1; @@ -793,7 +793,7 @@ restart: fn = xstrdup(arg); (void) rpmCleanPath(fn); - qva->qva_mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_BASENAMES, fn, 0); + qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_BASENAMES, fn, 0); if (qva->qva_mi == NULL) { int myerrno = 0; if (access(fn, F_OK) != 0) @@ -837,7 +837,7 @@ restart: } rpmMessage(RPMMESS_DEBUG, _("package record number: %u\n"), recOffset); /* RPMDBI_PACKAGES */ - qva->qva_mi = rpmdbInitIterator(ts->rpmdb, RPMDBI_PACKAGES, &recOffset, sizeof(recOffset)); + qva->qva_mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, &recOffset, sizeof(recOffset)); if (qva->qva_mi == NULL) { rpmError(RPMERR_QUERY, _("record %u could not be read\n"), recOffset); @@ -849,7 +849,7 @@ restart: case RPMQV_PACKAGE: /* XXX HACK to get rpmdbFindByLabel out of the API */ - qva->qva_mi = rpmdbInitIterator(ts->rpmdb, RPMDBI_LABEL, arg, 0); + qva->qva_mi = rpmtsInitIterator(ts, RPMDBI_LABEL, arg, 0); if (qva->qva_mi == NULL) { rpmError(RPMERR_QUERYINFO, _("package %s is not installed\n"), arg); res = 1; @@ -865,27 +865,25 @@ restart: int rpmcliQuery(QVA_t qva, const char ** argv) { - const char * rootDir = qva->qva_prefix; - rpmdb db = NULL; - rpmTransactionSet ts = NULL; + rpmTransactionSet ts; const char * arg; int ec = 0; + ts = rpmtransCreateSet(NULL, qva->qva_prefix); + + if (qva->qva_showPackage == NULL) + qva->qva_showPackage = showQueryPackage; + switch (qva->qva_source) { case RPMQV_RPM: case RPMQV_SPECFILE: break; default: - if (rpmdbOpen(rootDir, &db, O_RDONLY, 0644)) + if (rpmtsOpenDB(ts, O_RDONLY)) return 1; /* XXX W2DO? */ break; } - if (qva->qva_showPackage == NULL) - qva->qva_showPackage = showQueryPackage; - - ts = rpmtransCreateSet(db, rootDir); - if (qva->qva_source == RPMQV_ALL) { /*@-nullpass@*/ /* FIX: argv can be NULL, cast to pass argv array */ ec = rpmQueryVerify(qva, ts, (const char *) argv); @@ -898,10 +896,10 @@ int rpmcliQuery(QVA_t qva, const char ** argv) } } - ts = rpmtransFree(ts); - if (qva->qva_showPackage == showQueryPackage) qva->qva_showPackage = NULL; + ts = rpmtransFree(ts); + return ec; } diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c index 57b2e4930..3d5c34061 100644 --- a/lib/rpmchecksig.c +++ b/lib/rpmchecksig.c @@ -737,21 +737,19 @@ fprintf(stderr, "========================= Package DSA Signature\n"); int rpmcliSign(QVA_t qva, const char ** argv) { - const char * rootDir = "/"; - rpmdb db = NULL; rpmTransactionSet ts; const char * arg; + int dbmode = (qva->qva_mode != RPMSIGN_IMPORT_PUBKEY) + ? O_RDONLY : (O_RDWR | O_CREAT); int res = 0; int xx; if (argv == NULL) return res; - db = NULL; - xx = rpmdbOpen(rootDir, &db, - ((qva->qva_mode == RPMSIGN_IMPORT_PUBKEY) ? O_RDWR : O_RDONLY), 0644); + ts = rpmtransCreateSet(NULL, NULL); + xx = rpmtsOpenDB(ts, dbmode); if (xx != 0) return -1; - ts = rpmtransCreateSet(db, rootDir); switch (qva->qva_mode) { case RPMSIGN_CHK_SIGNATURE: diff --git a/lib/rpminstall.c b/lib/rpminstall.c index 6fa5a48f5..daa078de2 100644 --- a/lib/rpminstall.c +++ b/lib/rpminstall.c @@ -202,8 +202,6 @@ int rpmInstall(const char * rootDir, const char ** fileArgv, rpmprobFilterFlags probFilter, rpmRelocation * relocations) { - int mode = (transFlags & RPMTRANS_FLAG_TEST) ? O_RDONLY : (O_RDWR|O_CREAT); - rpmdb db = NULL; rpmTransactionSet ts = NULL; struct rpmEIU * eiu = memset(alloca(sizeof(*eiu)), 0, sizeof(*eiu)); @@ -221,16 +219,12 @@ int rpmInstall(const char * rootDir, const char ** fileArgv, if (rootDir == NULL) rootDir = ""; /*@=branchstate@*/ - if (rpmdbOpen(rootDir, &db, mode, 0644)) { - const char *dn; - dn = rpmGetPath(rootDir, "%{_dbpath}", NULL); - rpmMessage(RPMMESS_ERROR, - _("cannot open Packages database in %s\n"), dn); - dn = _free(dn); - eiu->numFailed++; - goto exit; - } - ts = rpmtransCreateSet(db, rootDir); + ts = rpmtransCreateSet(NULL, rootDir); + ts->transFlags = transFlags; + ts->dbmode = (transFlags & RPMTRANS_FLAG_TEST) + ? O_RDONLY : (O_RDWR|O_CREAT); + ts->notify = rpmShowProgress; + ts->notifyData = (void *) ((long)notifyFlags); if ((eiu->relocations = relocations) != NULL) { while (eiu->relocations->oldPath) @@ -342,10 +336,11 @@ restart: continue; } + ts->verify_legacy = 1; /*@-mustmod@*/ /* LCL: segfault */ - xx = rpmReadPackageFile(ts, eiu->fd, *eiu->fnp, &eiu->h); + eiu->rpmrc = rpmReadPackageFile(ts, eiu->fd, *eiu->fnp, &eiu->h); /*@=mustmod@*/ - eiu->rpmrc = (xx ? RPMRC_FAIL : RPMRC_OK); /* XXX HACK */ + ts->verify_legacy = 0; eiu->isSource = headerIsEntry(eiu->h, RPMTAG_SOURCEPACKAGE); xx = Fclose(eiu->fd); @@ -372,6 +367,12 @@ restart: if (eiu->rpmrc == RPMRC_OK || eiu->rpmrc == RPMRC_BADSIZE) { + /* Open database RDWR for binary packages. */ + if (rpmtsOpenDB(ts, ts->dbmode)) { + eiu->numFailed++; + goto exit; + } + if (eiu->relocations) { const char ** paths; int pft; @@ -401,7 +402,7 @@ restart: xx = headerNVR(eiu->h, &name, NULL, NULL); /*@-onlytrans@*/ - mi = rpmdbInitIterator(db, RPMTAG_NAME, name, 0); + mi = rpmtsInitIterator(ts, RPMTAG_NAME, name, 0); /*@=onlytrans@*/ count = rpmdbGetIteratorCount(mi); while ((oldH = rpmdbNextIterator(mi)) != NULL) { @@ -526,8 +527,7 @@ restart: packagesTotal = eiu->numRPMS + eiu->numSRPMS; rpmMessage(RPMMESS_DEBUG, _("installing binary packages\n")); - rc = rpmRunTransactions(ts, rpmShowProgress, - (void *) ((long)notifyFlags), + rc = rpmRunTransactions(ts, ts->notify, ts->notifyData, NULL, &probs, transFlags, probFilter); if (rc < 0) { @@ -558,7 +558,7 @@ restart: if (!(transFlags & RPMTRANS_FLAG_TEST)) { #if !defined(__LCLINT__) /* LCL: segfault */ eiu->rpmrc = rpmInstallSourcePackage(ts, eiu->fd, NULL, - rpmShowProgress, (void *) ((long)notifyFlags), NULL); + ts->notify, ts->notifyData, NULL); #endif if (eiu->rpmrc != RPMRC_OK) eiu->numFailed++; } @@ -589,10 +589,7 @@ int rpmErase(const char * rootDir, const char ** argv, rpmtransFlags transFlags, rpmEraseInterfaceFlags interfaceFlags) { - /* XXX W2DO? O_EXCL??? */ - int mode = (transFlags & RPMTRANS_FLAG_TEST) ? O_RDONLY : (O_RDWR|O_EXCL); - rpmdb db = NULL; - rpmTransactionSet ts = NULL; + rpmTransactionSet ts; int count; const char ** arg; @@ -605,20 +602,19 @@ int rpmErase(const char * rootDir, const char ** argv, if (argv == NULL) return 0; - if (rpmdbOpen(rootDir, &db, mode, 0644)) { - const char *dn; - dn = rpmGetPath( (rootDir ? rootDir : ""), "%{_dbpath}", NULL); - rpmMessage(RPMMESS_ERROR, _("cannot open %s/packages.rpm\n"), dn); - dn = _free(dn); - return -1; - } - ts = rpmtransCreateSet(db, rootDir); + ts = rpmtransCreateSet(NULL, rootDir); + ts->transFlags = transFlags; + /* XXX W2DO? O_EXCL??? */ + ts->dbmode = (transFlags & RPMTRANS_FLAG_TEST) + ? O_RDONLY : (O_RDWR|O_EXCL); + + (void) rpmtsOpenDB(ts, ts->dbmode); for (arg = argv; *arg; arg++) { rpmdbMatchIterator mi; /* XXX HACK to get rpmdbFindByLabel out of the API */ - mi = rpmdbInitIterator(db, RPMDBI_LABEL, *arg, 0); + mi = rpmtsInitIterator(ts, RPMDBI_LABEL, *arg, 0); count = rpmdbGetIteratorCount(mi); if (count <= 0) { rpmMessage(RPMMESS_ERROR, _("package %s is not installed\n"), *arg); @@ -774,7 +770,7 @@ IDTX IDTXload(rpmTransactionSet ts, rpmTag tag) Header h; /*@-branchstate@*/ - mi = rpmdbInitIterator(ts->rpmdb, tag, NULL, 0); + mi = rpmtsInitIterator(ts, tag, NULL, 0); while ((h = rpmdbNextIterator(mi)) != NULL) { rpmTagType type = RPM_NULL_TYPE; int_32 count = 0; @@ -888,25 +884,22 @@ IDTX IDTXglob(rpmTransactionSet ts, const char * globstr, rpmTag tag) int rpmRollback(/*@unused@*/ struct rpmInstallArguments_s * ia, /*@unused@*/ const char ** argv) { - rpmdb db = NULL; - rpmTransactionSet ts = NULL; + rpmTransactionSet ts; IDTX itids = NULL; const char * globstr = rpmExpand("%{_repackage_dir}/*.rpm", NULL); IDTX rtids = NULL; - int rc; - rc = rpmdbOpen(ia->rootdir, &db, O_RDWR, 0644); - - ts = rpmtransCreateSet(db, ia->rootdir); + ts = rpmtransCreateSet(NULL, ia->rootdir); itids = IDTXload(ts, RPMTAG_INSTALLTID); + rtids = IDTXglob(ts, globstr, RPMTAG_REMOVETID); globstr = _free(globstr); rtids = IDTXfree(rtids); itids = IDTXfree(itids); - ts = rpmtransFree(ts); + ts = rpmtransFree(ts); return 0; } diff --git a/lib/rpmlib.h b/lib/rpmlib.h index 9aec7c59f..b69f39d2e 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -597,7 +597,7 @@ void rpmFreeRpmrc(void) /** \ingroup rpmdb */ -typedef /*@abstract@*/ struct rpmdb_s * rpmdb; +typedef /*@abstract@*/ /*@refcounted@*/ struct rpmdb_s * rpmdb; /** \ingroup rpmdb */ @@ -612,6 +612,22 @@ typedef /*@abstract@*/ struct _dbiIndexSet * dbiIndexSet; extern int dbiTagsMax; /** \ingroup rpmdb + * Unreference a database instance. + * @retval db rpm database + * @return NULL always + */ +/*@null@*/ rpmdb rpmdbUnlink (/*@killref@*/ /*@only@*/ rpmdb db) + /*@modifies db @*/; + +/** \ingroup rpmdb + * Reference a database instance. + * @param db rpm database + * @return new rpm database reference + */ +rpmdb rpmdbLink (rpmdb db) + /*@modifies db @*/; + +/** \ingroup rpmdb * Open rpm database. * @param prefix path to top of install tree * @retval dbp address of rpm database @@ -648,9 +664,9 @@ int rpmdbVerify(/*@null@*/ const char * prefix) * @param db rpm database * @return 0 on success */ -int rpmdbClose (/*@only@*/ /*@null@*/ rpmdb db) +int rpmdbClose (/*@killref@*/ /*@only@*/ /*@null@*/ rpmdb db) /*@globals fileSystem@*/ - /*@modifies fileSystem @*/; + /*@modifies db, fileSystem @*/; /** \ingroup rpmdb * Sync all database indices. @@ -694,17 +710,6 @@ typedef /*@abstract@*/ struct _rpmdbMatchIterator * rpmdbMatchIterator; /*@modifies mi, fileSystem @*/; /** \ingroup rpmdb - * Return rpm database used by iterator. - * @todo Remove? - * @param mi rpm database iterator - * @return rpm database handle - */ -/*@unused@*/ -/*@kept@*/ /*@null@*/ rpmdb rpmdbGetIteratorRpmDB( - /*@null@*/ rpmdbMatchIterator mi) - /*@*/; - -/** \ingroup rpmdb * Return join key for current position of rpm database iterator. * @param mi rpm database iterator * @return current join key @@ -840,7 +845,7 @@ int rpmdbSetIteratorModified(/*@null@*/ rpmdbMatchIterator mi, int modified) * @return NULL on failure */ /*@only@*/ /*@null@*/ rpmdbMatchIterator rpmdbInitIterator( - /*@kept@*/ /*@null@*/ rpmdb db, int rpmtag, + /*@null@*/ rpmdb db, int rpmtag, /*@null@*/ const void * keyp, size_t keylen) /*@globals fileSystem@*/ /*@modifies db, fileSystem @*/; @@ -1192,15 +1197,46 @@ rpmRC rpmInstallSourcePackage(rpmTransactionSet ts, FD_t fd, fileSystem, internalState @*/; /** \ingroup rpmtrans + * Close the database used by the transaction. + * @param ts transaction set + * @return 0 on success + */ +int rpmtsCloseDB(rpmTransactionSet ts) + /*@modifies ts @*/; + +/** \ingroup rpmtrans + * Open the database used by the transaction. + * @param ts transaction set + * @param dbmode O_RDONLY or O_RDWR + * @return 0 on success + */ +int rpmtsOpenDB(rpmTransactionSet ts, int dbmode) + /*@modifies ts @*/; + +/** \ingroup rpmtrans + * Return transaction database iterator. + * @param ts transaction set + * @param rpmtag rpm tag + * @param keyp key data (NULL for sequential access) + * @param keylen key data length (0 will use strlen(keyp)) + * @return NULL on failure + */ +/*@only@*/ /*@null@*/ +rpmdbMatchIterator rpmtsInitIterator(const rpmTransactionSet ts, int rpmtag, + /*@null@*/ const void * keyp, size_t keylen) + /*@globals fileSystem @*/ + /*@modifies fileSystem @*/; + +/** \ingroup rpmtrans * Create an empty transaction set. * @param db rpm database (may be NULL if database is not accessed) * @param rootdir path to top of install tree * @return transaction set */ /*@only@*/ rpmTransactionSet rpmtransCreateSet( - /*@null@*/ /*@kept@*/ rpmdb db, + /*@null@*/ rpmdb db, /*@null@*/ const char * rootDir) - /*@*/; + /*@modifies db @*/; /** \ingroup rpmtrans * Add package to be installed to unordered transaction set. @@ -1258,8 +1294,7 @@ void rpmtransClean(rpmTransactionSet ts) */ /*@null@*/ rpmTransactionSet rpmtransFree(/*@only@*//*@null@*/ rpmTransactionSet ts) - /*@globals fileSystem @*/ - /*@modifies ts, fileSystem @*/; + /*@modifies ts @*/; /** \ingroup rpmtrans * Save file handle to be used as stderr when running package scripts. @@ -1473,8 +1508,8 @@ typedef enum rpmprobFilterFlags_e { * @return 0 on success, -1 on error, >0 with newProbs set */ int rpmRunTransactions(rpmTransactionSet ts, - rpmCallbackFunction notify, - /*@owned@*/ rpmCallbackData notifyData, + /*@observer@*/ rpmCallbackFunction notify, + /*@observer@*/ rpmCallbackData notifyData, rpmProblemSet okProbs, /*@out@*/ rpmProblemSet * newProbs, rpmtransFlags transFlags, diff --git a/lib/transaction.c b/lib/transaction.c index 4b9d2563e..f0b60005d 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -406,7 +406,6 @@ static int handleInstInstalledFiles(const rpmTransactionSet ts, TFI_t fi, { HGE_t hge = fi->hge; HFD_t hfd = (fi->hfd ? fi->hfd : headerFreeData); - rpmdb db = ts->rpmdb; rpmProblemSet probs = ts->probs; rpmtransFlags transFlags = ts->transFlags; rpmTagType oltype, omtype; @@ -423,7 +422,7 @@ static int handleInstInstalledFiles(const rpmTransactionSet ts, TFI_t fi, rpmdbMatchIterator mi; - mi = rpmdbInitIterator(db, RPMDBI_PACKAGES, &shared->otherPkg, sizeof(shared->otherPkg)); + mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, &shared->otherPkg, sizeof(shared->otherPkg)); h = rpmdbNextIterator(mi); if (h == NULL) { mi = rpmdbFreeIterator(mi); @@ -503,17 +502,16 @@ static int handleInstInstalledFiles(const rpmTransactionSet ts, TFI_t fi, static int handleRmvdInstalledFiles(const rpmTransactionSet ts, TFI_t fi, struct sharedFileInfo * shared, int sharedCount) /*@globals fileSystem @*/ - /*@modifies ts, fi, fileSystem @*/ + /*@modifies fi, fileSystem @*/ { HGE_t hge = fi->hge; - rpmdb db = ts->rpmdb; Header h; const char * otherStates; int i, xx; rpmdbMatchIterator mi; - mi = rpmdbInitIterator(db, RPMDBI_PACKAGES, + mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, &shared->otherPkg, sizeof(shared->otherPkg)); h = rpmdbNextIterator(mi); if (h == NULL) { @@ -1178,7 +1176,7 @@ int rpmRunTransactions( rpmTransactionSet ts, if (!(ts->ignoreSet & RPMPROB_FILTER_OLDPACKAGE)) { rpmdbMatchIterator mi; Header oldH; - mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_NAME, alp->name, 0); + mi = rpmtsInitIterator(ts, RPMTAG_NAME, alp->name, 0); while ((oldH = rpmdbNextIterator(mi)) != NULL) xx = ensureOlder(alp, oldH, ts->probs); mi = rpmdbFreeIterator(mi); @@ -1187,7 +1185,7 @@ int rpmRunTransactions( rpmTransactionSet ts, /* XXX multilib should not display "already installed" problems */ if (!(ts->ignoreSet & RPMPROB_FILTER_REPLACEPKG) && !alp->multiLib) { rpmdbMatchIterator mi; - mi = rpmdbInitIterator(ts->rpmdb, RPMTAG_NAME, alp->name, 0); + mi = rpmtsInitIterator(ts, RPMTAG_NAME, alp->name, 0); xx = rpmdbSetIteratorRE(mi, RPMTAG_VERSION, RPMMIRE_DEFAULT, alp->version); xx = rpmdbSetIteratorRE(mi, RPMTAG_RELEASE, @@ -1212,7 +1210,7 @@ int rpmRunTransactions( rpmTransactionSet ts, Header h; int fileCount; - mi = rpmdbInitIterator(ts->rpmdb, RPMDBI_PACKAGES, NULL, 0); + mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, NULL, 0); xx = rpmdbAppendIterator(mi, ts->removedPackages, ts->numRemovedPackages); while ((h = rpmdbNextIterator(mi)) != NULL) { if (headerGetEntry(h, RPMTAG_BASENAMES, NULL, NULL, &fileCount)) @@ -1259,7 +1257,7 @@ int rpmRunTransactions( rpmTransactionSet ts, /* Retrieve erased package header from the database. */ { rpmdbMatchIterator mi; - mi = rpmdbInitIterator(ts->rpmdb, RPMDBI_PACKAGES, + mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, &fi->record, sizeof(fi->record)); if ((fi->h = rpmdbNextIterator(mi)) != NULL) fi->h = headerLink(fi->h); @@ -1546,19 +1544,11 @@ assert(alp == fi->ap); h = headerFree(h); -#ifdef DYING - /*@-mustmod@*/ /* LCL: segfault */ - rpmrc = rpmReadPackageHeader(alp->fd, &h, NULL, NULL, NULL); - /*@=mustmod@*/ -#else - /* XXX Leave fd positioned at payload. */ - ts->need_payload = 1; /*@-mustmod@*/ /* LCL: segfault */ - xx = rpmReadPackageFile(ts, alp->fd, "rpmRunTransactions", &h); + rpmrc = rpmReadPackageFile(ts, alp->fd, + "rpmRunTransactions", &h); /*@=mustmod@*/ - ts->need_payload = 0; - rpmrc = (xx ? RPMRC_FAIL : RPMRC_OK); /* XXX HACK */ -#endif + if (!(rpmrc == RPMRC_OK || rpmrc == RPMRC_BADSIZE)) { /*@-noeffectuncon @*/ /* FIX: check rc */ (void)ts->notify(fi->h, RPMCALLBACK_INST_CLOSE_FILE, diff --git a/lib/ts.c b/lib/ts.c new file mode 100644 index 000000000..a8798d4f6 --- /dev/null +++ b/lib/ts.c @@ -0,0 +1,372 @@ +#include "system.h" +#include <fnmatch.h> +#include <fts.h> + +#include <rpmlib.h> +#include <rpmpgp.h> + +#include "depends.h" + +#include "debug.h" + +static int _debug = 0; + +#define BHPATH "/mnt/redhat/beehive/comps/dist" +#define BHCOLL "7.2" + +#if 0 +#define BHN "{basesystem,bash,filesystem,glibc-common,glibc,ldconfig,libtermcap,mktemp,setup,termcap}" +#else +#define BHN "setup" +#endif + +#define BHVR "*" +#define BHA "*" + +const char * bhpath = BHPATH; +int bhpathlen = sizeof(BHPATH)-1; +const char * bhcoll = BHCOLL; +const char * bhn = BHN; +const char * bhvr = BHVR; +const char * bha = BHA; + +int bhlvl = -1; + +struct ftsglob_s { + const char ** patterns; + int fnflags; +}; + +const char * lvl0[] = { + NULL, NULL +}; + +const char * lvl1[] = { + NULL, NULL +}; + +const char * lvl2[] = { + NULL, NULL +}; + +const char * lvl3[] = { + NULL, NULL +}; + +const char * lvl4[] = { + NULL, NULL +}; + +const char * lvl5[] = { + NULL, NULL +}; + +const char * lvl6[] = { + NULL, NULL +}; + +const char * lvl7[] = { + NULL, NULL +}; + +static struct ftsglob_s bhglobs[] = { +#if 0 + { BHPATH "/" BHCOLL "/" BHN "/" BHVR "/" BHA "/*", 0 }, + { BHCOLL, FNM_PERIOD }, + { BHN, FNM_PERIOD }, + { BHVR, FNM_PERIOD }, + { BHA, FNM_PERIOD }, +#else + { lvl0, FNM_PERIOD }, + { lvl1, FNM_PERIOD }, + { lvl2, FNM_PERIOD }, + { lvl3, FNM_PERIOD }, + { lvl4, FNM_PERIOD }, + { lvl5, FNM_PERIOD }, + { lvl6, FNM_PERIOD }, + { lvl7, FNM_PERIOD }, +#endif +}; +static int nbhglobs = sizeof(bhglobs)/sizeof(bhglobs[0]); + +static const char * ftsInfoStrings[] = { + "UNKNOWN", + "D", + "DC", + "DEFAULT", + "DNR", + "DOT", + "DP", + "ERR", + "F", + "INIT", + "NS", + "NSOK", + "SL", + "SLNONE", + "W", +}; + +static const char * ftsInfoStr(int fts_info) { + if (!(fts_info >= 1 && fts_info <= 14)) + fts_info = 0; + return ftsInfoStrings[ fts_info ]; +} + +static int ftsPrint(FTS * ftsp, FTSENT * fts, rpmTransactionSet ts) +{ + struct ftsglob_s * bhg; + const char ** patterns; + const char * pattern; + const char * n, * v, * r; + const char * s; + FD_t fd = NULL; + Header h = NULL; + rpmRC rc; + int indent = 2; + int lvl; + int xx; + + switch (fts->fts_info) { + case FTS_D: /* preorder directory */ + if (fts->fts_pathlen < bhpathlen) + break; + + /* Grab the level of the beehive top directory. */ + if (bhlvl < 0) { + if (fts->fts_pathlen == bhpathlen && !strcmp(fts->fts_path, bhpath)) + bhlvl = fts->fts_level; + else + break; + } + lvl = fts->fts_level - bhlvl; +#ifdef DYING + if (lvl <= 0) { + break; + } else if (lvl == 1) { + /* Skip collections we're not interested in. */ + if (!strcmp(fts->fts_name, bhcoll)) + break; + xx = fts_set(ftsp, fts, FTS_SKIP); + break; + } else if (lvl == 2) { + /* Skip names we're not interested in. */ + if (!strcmp(fts->fts_name, bhn)) + break; + xx = fts_set(ftsp, fts, FTS_SKIP); + break; + } else if (lvl == 3) { + /* Skip version-release we're not interested in. */ + if (!strcmp(fts->fts_name, bhvr)) + break; + xx = fts_set(ftsp, fts, FTS_SKIP); + break; + } else if (lvl == 4) { + /* Skip arch we're not interested in. */ + if (!strcmp(fts->fts_name, bha)) + break; + xx = fts_set(ftsp, fts, FTS_SKIP); + break; + } +#else + if (lvl < 0 || lvl >= nbhglobs) + break; + +#if 0 + fprintf(stderr, "FTS_%s\t%*s %s\n", ftsInfoStr(fts->fts_info), + indent * (fts->fts_level < 0 ? 0 : fts->fts_level), "", + fts->fts_name); +#endif + + /* Full path glob expression check. */ + bhg = bhglobs; + + if ((patterns = bhg->patterns) != NULL) + while ((pattern = *patterns++) != NULL) { + if (*pattern == '/') + xx = fnmatch(pattern, fts->fts_path, bhg->fnflags); + else + xx = fnmatch(pattern, fts->fts_name, bhg->fnflags); + if (xx == 0) + break; + } + + /* Level specific glob expression check(s). */ + if (lvl == 0) + break; + bhg += lvl; + + if ((patterns = bhg->patterns) != NULL) + while ((pattern = *patterns++) != NULL) { + if (*pattern == '/') + xx = fnmatch(pattern, fts->fts_path, bhg->fnflags); + else + xx = fnmatch(pattern, fts->fts_name, bhg->fnflags); + if (xx == 0) + break; + else + xx = fts_set(ftsp, fts, FTS_SKIP); + } +#endif + break; + case FTS_DP: /* postorder directory */ +#if 0 + fprintf(stderr, "FTS_%s\t%*s %s\n", ftsInfoStr(fts->fts_info), + indent * (fts->fts_level < 0 ? 0 : fts->fts_level), "", + fts->fts_name); +#endif + break; + case FTS_F: /* regular file */ + if (fts->fts_level >= 0) { + if (strcmp(fts->fts_parent->fts_name, "SRPMS")) { + xx = fts_set(ftsp, fts->fts_parent, FTS_SKIP); + break; + } + } + s = fts->fts_name + fts->fts_namelen + 1 - sizeof(".rpm"); + if (strcmp(s, ".rpm")) + break; + rpmMessage(RPMMESS_DEBUG, "============== %s\n", fts->fts_accpath); + fd = Fopen(fts->fts_accpath, "r"); + if (fd == NULL || Ferror(fd)) + break; + rc = rpmReadPackageFile(ts, fd, fts->fts_path, &h); + xx = Fclose(fd); + fd = NULL; + if (rc != RPMRC_OK) + break; + xx = headerNVR(h, &n, &v, &r); + fprintf(stderr, "\t%*s %s-%s-%s\n", + indent * (fts->fts_level < 0 ? 0 : fts->fts_level), "", + n, v, r); + xx = rpmtransAddPackage(ts, h, NULL, fts->fts_path, 1, NULL); + break; + case FTS_NS: /* stat(2) failed */ + case FTS_DNR: /* unreadable directory */ + case FTS_ERR: /* error; errno is set */ + fprintf(stderr, "FTS_%s\t%*s %s\n", ftsInfoStr(fts->fts_info), + indent * (fts->fts_level < 0 ? 0 : fts->fts_level), "", + fts->fts_name); + break; + case FTS_DC: /* directory that causes cycles */ + case FTS_DEFAULT: /* none of the above */ + case FTS_DOT: /* dot or dot-dot */ + case FTS_INIT: /* initialized only */ + case FTS_NSOK: /* no stat(2) requested */ + case FTS_SL: /* symbolic link */ + case FTS_SLNONE: /* symbolic link without target */ + case FTS_W: /* whiteout object */ + default: + fprintf(stderr, "FTS_%s\t%*s %s\n", ftsInfoStr(fts->fts_info), + indent * (fts->fts_level < 0 ? 0 : fts->fts_level), "", + fts->fts_name); + break; + } + + h = headerFree(h); + if (fd) + xx = Fclose(fd); + return 0; +} + +static char * const ftsSet[] = { + BHPATH, NULL, +}; + + +static struct poptOption optionsTable[] = { + { "verbose", 'v', 0, 0, 'v', NULL, NULL }, + { "debug", 'd', POPT_ARG_VAL, &_debug, -1, NULL, NULL }, + POPT_AUTOHELP + POPT_TABLEEND +}; + + +int +main(int argc, const char *argv[]) +{ + poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0); + const char * rootDir = ""; + rpmdb db = NULL; + rpmTransactionSet ts = NULL; + FTS * ftsp; + int ftsOpts = (FTS_COMFOLLOW | FTS_LOGICAL | FTS_NOSTAT); + FTSENT * fts; + char buf[BUFSIZ]; + const char ** args; + const char * arg; + char * t; + int rc; + int ec = 1; + int xx; + + while ((rc = poptGetNextOpt(optCon)) > 0) { + switch (rc) { + case 'v': + rpmIncreaseVerbosity(); + /*@switchbreak@*/ break; + default: + /*@switchbreak@*/ break; + } + } + + rpmReadConfigFiles(NULL, NULL); + + ts = rpmtransCreateSet(db, rootDir); + (void) rpmtsOpenDB(ts, O_RDONLY); + + args = poptGetArgs(optCon); + if (args) + while ((arg = *args++) != NULL) { + + t = buf; + *t = '\0'; + t = stpcpy(t, BHPATH); + *t++ = '/'; + t = stpcpy(t, BHCOLL); + *t++ = '/'; + t = stpcpy(t, arg); + *t++ = '/'; + t = stpcpy(t, "*"); + *t++ = '/'; + t = stpcpy(t, "i386"); + *t++ = '/'; + t = stpcpy(t, "*.rpm"); + +fprintf(stderr, "*** \"%s\"\n", buf); + lvl0[0] = buf; + lvl1[0] = BHCOLL; + lvl2[0] = arg; + +if (!_debug) { + ftsp = fts_open(ftsSet, ftsOpts, NULL); + while((fts = fts_read(ftsp)) != NULL) + xx = ftsPrint(ftsp, fts, ts); + xx = fts_close(ftsp); +} + + } + +if (!_debug) { + { rpmDependencyConflict conflicts = NULL; + int numConflicts = 0; + + (void) rpmdepCheck(ts, &conflicts, &numConflicts); + + /*@-branchstate@*/ + if (conflicts) { + rpmMessage(RPMMESS_ERROR, _("failed dependencies:\n")); + printDepProblems(stderr, conflicts, numConflicts); + conflicts = rpmdepFreeConflicts(conflicts, numConflicts); + } + /*@=branchstate@*/ + } + + (void) rpmdepOrder(ts); +} + +exit: + ts = rpmtransFree(ts); + + return ec; +} diff --git a/lib/verify.c b/lib/verify.c index 7f0142a1b..c9cbf471e 100644 --- a/lib/verify.c +++ b/lib/verify.c @@ -581,28 +581,27 @@ int showVerifyPackage(QVA_t qva, rpmTransactionSet ts, Header h) int rpmcliVerify(QVA_t qva, const char ** argv) { - const char * rootDir = qva->qva_prefix; - const char * arg; - rpmdb db = NULL; rpmTransactionSet ts; + const char * arg; int ec = 0; + ts = rpmtransCreateSet(NULL, qva->qva_prefix); + + if (qva->qva_showPackage == NULL) + qva->qva_showPackage = showVerifyPackage; + + switch (qva->qva_source) { case RPMQV_RPM: if (!(qva->qva_flags & VERIFY_DEPS)) break; /*@fallthrough@*/ default: - if (rpmdbOpen(rootDir, &db, O_RDONLY, 0644)) + if (rpmtsOpenDB(ts, O_RDONLY)) return 1; /* XXX W2DO? */ break; } - if (qva->qva_showPackage == NULL) - qva->qva_showPackage = showVerifyPackage; - - ts = rpmtransCreateSet(db, rootDir); - if (qva->qva_source == RPMQV_ALL) { /*@-nullpass@*/ /* FIX: argv can be NULL, cast to pass argv array */ ec = rpmQueryVerify(qva, ts, (const char *) argv); @@ -615,10 +614,10 @@ int rpmcliVerify(QVA_t qva, const char ** argv) } } - ts = rpmtransFree(ts); - if (qva->qva_showPackage == showVerifyPackage) qva->qva_showPackage = NULL; + ts = rpmtransFree(ts); + return ec; } @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n" "Language-Team: Czech <cs@li.org>\n" @@ -9,71 +9,66 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:37 -#, c-format -msgid "cannot open rpm database in %s\n" -msgstr "nemohu otevøít RPM databázi v %s\n" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "chybné závislosti pøi sestavování:\n" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "Nelze otevøít spec soubor %s: %s\n" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "Nelze otevøít rouru pro tar: %m\n" #. Give up -#: build.c:178 +#: build.c:162 #, c-format msgid "Failed to read spec file from %s\n" msgstr "Nelze èíst spec soubor z %s\n" -#: build.c:206 +#: build.c:190 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "Nelze pøejmenovat %s na %s: %m\n" -#: build.c:245 +#: build.c:229 #, c-format msgid "failed to stat %s: %m\n" msgstr "nemohu zjistit stav %s: %m\n" -#: build.c:250 +#: build.c:234 #, c-format msgid "File %s is not a regular file.\n" msgstr "Soubor %s není obyèejný soubor.\n" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "Nezdá se, ¾e by %s byl spec soubor.\n" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "Sestavuji cílové platformy: %s\n" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "Sestavuji pro cíl %s\n" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "parametr není RPM balíèek\n" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "chyba pøi pøi ètení hlavièky balíèku\n" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "nemohu znovu otevøít payload: %s\n" @@ -404,44 +399,44 @@ msgstr "--sign mù¾e být pou¾it jen pøi sestavování balíèkù" msgid "exec failed\n" msgstr "spu¹tìní selhalo\n" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "ke znovusestavení nezadány ¾ádné balíèky" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "pro sestavení nezadány ¾ádné spec soubory" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "pro sestavení nezadány ¾ádné tar soubory" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "nezadány ¾ádné balíèky pro odstranìní" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "nezadány ¾ádné balíèky pro instalaci" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "k dotazu nezadány ¾ádné parametry" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "pro kontrolu nezadány ¾ádné balíèky" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "neoèekávané parametry pro --querytags " -#: rpmqv.c:1156 +#: rpmqv.c:1149 #, fuzzy msgid "no arguments given" msgstr "k dotazu nezadány ¾ádné parametry" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 msgid "Unable to open temp file.\n" msgstr "Nelze otevøít doèasný soubor.\n" @@ -652,7 +647,7 @@ msgstr "Soubor nenalezen globem: %s\n" msgid "Could not open %%files file %s: %s\n" msgstr "Nemohu otevøít %%files soubor %s: %s\n" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "øádek: %s\n" @@ -727,156 +722,156 @@ msgstr "getGidS: pøíli¹ mnoho GID\n" msgid "Could not canonicalize hostname: %s\n" msgstr "Nemohu získat jméno poèítaèe: %s\n" -#: build/pack.c:81 +#: build/pack.c:79 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "vytváøení archívu selhalo na souboru %s: %s\n" -#: build/pack.c:84 +#: build/pack.c:82 #, c-format msgid "create archive failed: %s\n" msgstr "vytváøení archívu selhalo: %s\n" -#: build/pack.c:106 +#: build/pack.c:104 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "zápis cpio_copy selhal: %s\n" -#: build/pack.c:113 +#: build/pack.c:111 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "ètení cpio_copy selhalo: %s\n" -#: build/pack.c:216 +#: build/pack.c:214 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "Nemohu otevøít PreIn soubor: %s\n" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "Nemohu otevøít PreUn soubor: %s\n" -#: build/pack.c:230 +#: build/pack.c:228 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "Nemohu otevøít PostIn soubor: %s\n" -#: build/pack.c:237 +#: build/pack.c:235 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "Nemohu otevøít PostUn soubor: %s\n" -#: build/pack.c:245 +#: build/pack.c:243 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "Nemohu otevøít VerifyScript soubor: %s\n" -#: build/pack.c:260 +#: build/pack.c:258 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "Nemohu otevøít soubor se spu¹tí (trigger): %s\n" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "readRPM: otevøení %s: %s\n" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "readRPM: ètení %s: %s\n" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: Fseek selhal: %s\n" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s není RPM balíèek\n" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: ètení hlavièky z %s\n" -#: build/pack.c:475 +#: build/pack.c:467 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "Nemohu pøeèíst hlavièku z %s: %s\n" -#: build/pack.c:493 +#: build/pack.c:485 #, fuzzy msgid "Unable to write temp header\n" msgstr "Nemohu zapsat hlavièku do %s: %s\n" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "©patná CSA data\n" -#: build/pack.c:536 +#: build/pack.c:528 #, fuzzy msgid "Unable to write final header\n" msgstr "Nemohu zapsat hlavièku do %s: %s\n" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "Generuji podpis: %d\n" -#: build/pack.c:567 +#: build/pack.c:559 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "Nemohu pøeèíst hlavièku z %s: %s\n" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "Nemohu otevøít %s: %s\n" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "Nemohu zapsat balíèek: %s\n" -#: build/pack.c:626 +#: build/pack.c:618 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "Nemohu otevøít cíl pro podepsání %s: %s\n" -#: build/pack.c:636 +#: build/pack.c:628 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "Nemohu pøeèíst hlavièku z %s: %s\n" -#: build/pack.c:650 +#: build/pack.c:642 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "Nemohu zapsat hlavièku do %s: %s\n" -#: build/pack.c:660 +#: build/pack.c:652 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "Nemohu pøeèíst payload z %s: %s\n" -#: build/pack.c:666 +#: build/pack.c:658 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "Nemohu zapsat payload do %s: %s\n" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "Zapsáno: %s\n" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "Nemohu vygenerovat jméno souboru pro balíèek %s: %s\n" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "nemohu vytvoøit %s: %s\n" @@ -1438,7 +1433,7 @@ msgid " failed - " msgstr "selhal - " #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -1447,65 +1442,85 @@ msgstr "" "Závislost \"B\" potøebuje období (pøedpokládáno stejné jako \"A\")\n" "\tA %s\tB %s\n" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "ANO" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "NE " -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, c-format +msgid "cannot open Packages database in %s\n" +msgstr "nemohu otevøít databázi balíèkù v %s\n" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, fuzzy, c-format +msgid "package %s already added, ignoring\n" +msgstr "balíèek %s je ji¾ nainstalován" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "%s: %-45s ANO (pøidány soubory)\n" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "%s: %-45s ANO (pøidáno poskytuje)\n" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-s (ke¹ováno)\n" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s ANO (rpmrc poskytuje)\n" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s ANO (rpmlib poskytuje)\n" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s ANO (db soubory)\n" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s ANO (db poskytuje)\n" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s ANO (db balíèek)\n" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NE\n" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) pøidáno do ke¹e závislostí.\n" @@ -1513,43 +1528,43 @@ msgstr "%s: (%s, %s) pøidáno do ke¹e závislostí.\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, 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:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "balíèek %s koliduje: %s\n" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "========== ukládání tsort relací\n" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 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:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "SMYÈKA:\n" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "========== pokraèuje tsort ...\n" @@ -2283,64 +2298,64 @@ msgstr "nemohu vytvoøit %s: %s\n" msgid "cannot write to %%%s %s\n" msgstr "nemohu zapsat do %%%s %s\n" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "oèekávám balíèek se zdrojovými kódy, nalezen v¹ak binární\n" -#: lib/psm.c:1330 +#: lib/psm.c:1329 msgid "source package contains no .spec file\n" msgstr "zdrojový balíèek neobsahuje .spec soubor\n" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: spou¹tím %s skript(y) (pokud existují)\n" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "provedení skripletu %s z %s-%s-%s selhalo, návratový kód byl: %s\n" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "provedení %s skripletu z %s-%s-%s selhalo, návratový kód: %d\n" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s obsahuje %d souborù, test = %d\n" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "%s: scriptlet %s selhal (%d), pøeskakuji %s-%s-%s\n" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "u¾ivatel %s neexistuje - pou¾it u¾ivatel root\n" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ita skupina root\n" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalování archívu selhalo %s%s: %s\n" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr " na souboru " -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nemohu otevøít %s: %s\n" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s selhalo\n" @@ -2388,8 +2403,8 @@ msgstr "balíèek nemá vlastníka souboru ani seznamy id\n" msgid "can't query %s: %s\n" msgstr "nemohu provést dotaz %s: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "otevøení %s selhalo: %s\n" @@ -2403,7 +2418,7 @@ msgstr "dotaz na %s se nezdaøil\n" msgid "old format source packages cannot be queried\n" msgstr "nelze provést dotaz na zdrojové balíèky starého formátu\n" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: Fread selhalo: %s\n" @@ -2462,7 +2477,7 @@ msgstr "záznam balíèku èíslo: %u\n" msgid "record %u could not be read\n" msgstr "záznam %d nelze pøeèíst\n" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "balíèek %s není nainstalován\n" @@ -2538,58 +2553,53 @@ msgstr "Pøipravuji..." msgid "Preparing packages for installation..." msgstr "Pøipravuji balíèky pro instalaci..." -#: lib/rpminstall.c:228 -#, c-format -msgid "cannot open Packages database in %s\n" -msgstr "nemohu otevøít databázi balíèkù v %s\n" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "Stahuji %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr " ... jako %s\n" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "pøeskakuji %s - pøenos selhal - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "balíèek %s není pøemístitelný\n" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "chyba pøi ètení ze souboru %s\n" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "soubor %s vy¾aduje novìj¹í verzi RPM\n" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "%s nemù¾e být nainstalován\n" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "nalezeno %d zdrojových a %d binárních balíèkù\n" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "nevyøe¹ené závislosti:\n" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "instaluji binární balíèky\n" @@ -2598,26 +2608,21 @@ msgstr "instaluji binární balíèky\n" msgid "cannot open file %s: %s\n" msgstr "nemohu otevøít soubor %s: %s\n" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "chyba: nemohu otevøít %s/packages.rpm\n" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" urèuje více balíèkù\n" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "odstranìní tìchto balíèkù by poru¹ilo závislosti:\n" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "nemohu otevøít %s: %s\n" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "Instaluji %s\n" @@ -2874,7 +2879,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "%s pøeskoèeno, proto¾e chybí pøíznak\n" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "vynechávám adresáø %s\n" @@ -3083,11 +3088,11 @@ msgstr "chyba(%d) pøi ukládání záznamu %s do %s\n" msgid "error(%d) removing record %s from %s\n" msgstr "chyba(%d) pøi odstraòování záznamu %s z %s\n" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "nebyla nastavena dbpath\n" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" @@ -3095,115 +3100,115 @@ msgstr "" "databáze je ve starém formátu; pou¾ijte --rebuilddb pro pøevod do nového\n" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, c-format msgid "error(%d) counting packages\n" msgstr "chyba(%d) pøi poèítání balíèkù\n" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "záznam èíslo %d v databázi je chybný -- vynechávám.\n" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "rpmdb: poru¹ená polo¾ka hlavièky #%u, pøeskakuji.\n" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: nemohu èíst hlavièku na adrese 0x%x\n" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstraòuji \"%s\" z indexu %s.\n" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing %d entries from %s index.\n" msgstr "odstraòuji %d polo¾ek z indexu %s.\n" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "chyba(%d) pøi alokaci nové instance balíèku\n" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "pøidávám \"%s\" do indexu %s\n" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, c-format msgid "adding %d entries to %s index.\n" msgstr "pøidávám %d polo¾ek do indexu %s.\n" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "odstraòuji %s po úspì¹ném znovusestavení db3.\n" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "nebyla nastavena dbpath" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "databázi %s pøevádím do %s\n" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "doèasná databáze %s ji¾ existuje\n" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, c-format msgid "creating directory %s\n" msgstr "vytváøím adresáø %s\n" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, c-format msgid "creating directory %s: %s\n" msgstr "vytváøím adresáø %s: %s\n" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "otevírám starou databázi s dbapi %d\n" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "otevírám novou databázi s dbapi %d\n" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, c-format msgid "cannot add record originally at %u\n" msgstr "nemohu pøidat záznam - pùvodnì u %d\n" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "databázi nelze zvovu vytvoøit; pùvodní databáze zùstává na svém místì\n" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "starou databázi nelze nahradit novou databází!\n" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "pro obnovení nahraïte soubory v %s soubory z %s" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, c-format msgid "removing directory %s\n" msgstr "ma¾u adresáø %s\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "nemohu odstranit adresáø %s: %s\n" @@ -3415,6 +3420,12 @@ msgstr "url port musí být èíslo\n" msgid "failed to create %s: %s\n" msgstr "nemohu vytvoøit %s: %s\n" +#~ msgid "cannot open rpm database in %s\n" +#~ msgstr "nemohu otevøít RPM databázi v %s\n" + +#~ msgid "cannot open %s/packages.rpm\n" +#~ msgstr "chyba: nemohu otevøít %s/packages.rpm\n" + #~ msgid "add a signature to a package" #~ msgstr "pøidat do balíèku podpis" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n" @@ -10,71 +10,66 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 0.9alpha\n" -#: build.c:37 -#, c-format -msgid "cannot open rpm database in %s\n" -msgstr "kan ikke åbne rpm-database i %s\n" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "afhængighedskrav for pakkeopbygning kunne ikke imødekommes:\n" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "Kan ikke åbne spec-fil %s: %s\n" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "Kunne ikke åbne tar-videreførsel: %m\n" #. Give up -#: build.c:178 +#: build.c:162 #, c-format msgid "Failed to read spec file from %s\n" msgstr "Kunne ikke læse spec-fil fra %s\n" -#: build.c:206 +#: build.c:190 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "Kunne ikke omdøbe %s til %s: %m\n" -#: build.c:245 +#: build.c:229 #, c-format msgid "failed to stat %s: %m\n" msgstr "kunne ikke finde %s: %m\n" -#: build.c:250 +#: build.c:234 #, c-format msgid "File %s is not a regular file.\n" msgstr "Filen %s er ikke en regulær fil.\n" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "Filen %s synes ikke at være en spec-fil.\n" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "Opbygger mål-platforme: %s\n" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "Opbygger for mål %s\n" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "parameter er ikke en RPM-pakke\n" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "fejl ved læsning af hovedet på pakke\n" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "kan ikke genåbne pakkeindhold: %s\n" @@ -399,44 +394,44 @@ msgstr "--sign kan kun bruges ved pakkeopbygning" msgid "exec failed\n" msgstr "eksekvering mislykkedes\n" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "ingen pakkefiler angivet til genopbygning" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "ingen spec-fil angivet til opbygning" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "ingen tar-arkiver angivet til opbygning" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "ingen pakker angivet ved afinstallation" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "ingen pakker angivet ved installation" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "ingen parametre angivet ved forespørgsel" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "ingen parametre angivet ved verifikation" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "uventede parametre til --querytags " -#: rpmqv.c:1156 +#: rpmqv.c:1149 #, fuzzy msgid "no arguments given" msgstr "ingen parametre angivet ved forespørgsel" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 msgid "Unable to open temp file.\n" msgstr "Kunne ikke åbne midlertidig fil.\n" @@ -647,7 +642,7 @@ msgstr "Fil ikke fundet med glob: %s\n" msgid "Could not open %%files file %s: %s\n" msgstr "Kunne ikke åbne '%%files'-fil %s: %s\n" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "linie: %s\n" @@ -724,156 +719,156 @@ msgstr "getGnameS: for mange gid'er\n" msgid "Could not canonicalize hostname: %s\n" msgstr "Kunne ikke kanonisere værtsnavn: %s\n" -#: build/pack.c:81 +#: build/pack.c:79 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "arkivoprettelse mislykkedes ved fil %s: %s\n" -#: build/pack.c:84 +#: build/pack.c:82 #, fuzzy, c-format msgid "create archive failed: %s\n" msgstr "arkivoprettelse mislykkedes ved fil %s: %s\n" -#: build/pack.c:106 +#: build/pack.c:104 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "cpio_copy-skrivning mislykkedes: %s\n" -#: build/pack.c:113 +#: build/pack.c:111 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "cpio_copy-læsning mislykkedes: %s\n" -#: build/pack.c:216 +#: build/pack.c:214 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "Kunne ikke åbne 'PreIn'-fil: %s\n" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "Kunne ikke åbne 'PreUn'-fil: %s\n" -#: build/pack.c:230 +#: build/pack.c:228 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "Kunne ikke åbne 'PostIn'-fil: %s\n" -#: build/pack.c:237 +#: build/pack.c:235 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "Kunne ikke åbne 'PostUn'-fil: %s\n" -#: build/pack.c:245 +#: build/pack.c:243 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "Kunne ikke åbne 'VerifyScript'-fil: %s\n" -#: build/pack.c:260 +#: build/pack.c:258 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "Kunne ikke åbne skriptfilen Trigger: %s\n" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "readRPM: åbn %s: %s\n" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "readRPM: læs %s: %s\n" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, fuzzy, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: Fread mislykkedes: %s\n" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s er ikke nogen RPM-pakke\n" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: læser hoved fra %s\n" -#: build/pack.c:475 +#: build/pack.c:467 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "Kunne ikke læse hoved fra %s: %s\n" -#: build/pack.c:493 +#: build/pack.c:485 #, fuzzy msgid "Unable to write temp header\n" msgstr "Kunne ikke skrive hoved til %s: %s\n" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "Ugyldige CSA-data\n" -#: build/pack.c:536 +#: build/pack.c:528 #, fuzzy msgid "Unable to write final header\n" msgstr "Kunne ikke skrive hoved til %s: %s\n" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "Genererer signatur: %d\n" -#: build/pack.c:567 +#: build/pack.c:559 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "Kunne ikke læse hoved fra %s: %s\n" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "Kunne ikke åbne %s: %s\n" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunne ikke skrive pakke: %s\n" -#: build/pack.c:626 +#: build/pack.c:618 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "Kunne ikke åbne sigtarget %s: %s\n" -#: build/pack.c:636 +#: build/pack.c:628 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "Kunne ikke læse hoved fra %s: %s\n" -#: build/pack.c:650 +#: build/pack.c:642 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "Kunne ikke skrive hoved til %s: %s\n" -#: build/pack.c:660 +#: build/pack.c:652 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "Kunne ikke læse pakkeindhold fra %s: %s\n" -#: build/pack.c:666 +#: build/pack.c:658 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "Kunne ikke skrive pakkeindhold til %s: %s\n" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "Kunne ikke generere filnavn til oprettelse af pakke %s: %s\n" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "kan ikke oprette %s: %s\n" @@ -1439,7 +1434,7 @@ msgid " failed - " msgstr " mislykkedes - " #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -1448,66 +1443,86 @@ msgstr "" "\"B\"-afhængighed kræver en epoke (antager samme som \"A\")\n" "\tA %s\tB %s\n" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 #, fuzzy msgid "NO " msgstr "IKKE O.K." -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, c-format +msgid "cannot open Packages database in %s\n" +msgstr "kunne ikke åbne Packages-database i %s\n" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, fuzzy, c-format +msgid "package %s already added, ignoring\n" +msgstr "pakken %s er allerede installeret" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "%s: %-45s JA (tilføjede filer)\n" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "%s: %-45s JA (tilføjede 'provide')\n" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-3s (husket)\n" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s JA (rpmrc tilfører)\n" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s JA (rpmlib tilfører)\n" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s JA (db-filer)\n" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s JA (db tilfører)\n" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s JA (db-pakke)\n" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NEJ\n" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) tilføjet til afhængigheds-buffer.\n" @@ -1515,42 +1530,42 @@ msgstr "%s: (%s, %s) tilføjet til afhængigheds-buffer.\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, 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:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "pakke %s skaber konflikt: %s\n" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "fjerne %s-%s-%s \"%s\" fra tsort-relationer.\n" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "========== gemmer tsort-relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "LØKKE:\n" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "========== fortsætter tsort ...\n" @@ -2302,66 +2317,66 @@ msgstr "kan ikke oprette %s: %s\n" msgid "cannot write to %%%s %s\n" msgstr "kunne ikke skrive til %s\n" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binær fundet\n" -#: lib/psm.c:1330 +#: lib/psm.c:1329 msgid "source package contains no .spec file\n" msgstr "kildepakke indeholder ingen .spec-fil\n" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "kører postinstallations-skript (hvis det findes)\n" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" "kørsel af småskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" "kørsel af småskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "pakke: %s-%s-%s filer test = %d\n" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "bruger %s eksisterer ikke - bruger root\n" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "gruppe %s eksisterer ikke - bruger root\n" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "udpakning af arkiv mislykkedes%s%s: %s\n" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr " for fil " -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s mislykkedes\n" @@ -2409,8 +2424,8 @@ msgstr "pakke har hverken filejerskabs- eller id-lister\n" msgid "can't query %s: %s\n" msgstr "kunne ikke forespørge %s: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "åbning af %s mislykkedes %s\n" @@ -2424,7 +2439,7 @@ msgstr "forespørgsel af %s mislykkedes\n" msgid "old format source packages cannot be queried\n" msgstr "pakke med gammelt kildeformat kan ikke forespørges\n" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: læs manifest mislykkedes: %s\n" @@ -2483,7 +2498,7 @@ msgstr "pakkens post-nummer: %u\n" msgid "record %u could not be read\n" msgstr "post %d kunne ikke læses\n" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "pakken %s er ikke installeret\n" @@ -2559,58 +2574,53 @@ msgstr "Forbereder..." msgid "Preparing packages for installation..." msgstr "Forbereder pakker til installation..." -#: lib/rpminstall.c:228 -#, c-format -msgid "cannot open Packages database in %s\n" -msgstr "kunne ikke åbne Packages-database i %s\n" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "Modtager %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr " ... som %s\n" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "overspringer %s - overførsel mislykkedes - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "pakke %s kan ikke omrokeres\n" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "fejl ved læsning fra filen %s\n" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "filen %s kræver en nyere version af RPM\n" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "%s kunne ikke installeres\n" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "fandt %d kilde- og %d binærpakker\n" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "afhængighedskrav, der ikke kunne imødekommes:\n" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "installerer binærpakker\n" @@ -2619,26 +2629,21 @@ msgstr "installerer binærpakker\n" msgid "cannot open file %s: %s\n" msgstr "kunne ikke åbne fil %s: %s\n" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "kunne ikke åbne %s/packages.rpm\n" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" angiver flere pakker\n" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "fjernelse af disse pakker ville bryde afhængighederne:\n" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" @@ -2896,7 +2901,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "%s oversprunget grundet manglende ok-flag\n" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer kataloget %s\n" @@ -3108,11 +3113,11 @@ msgstr "fejl(%d) ved gemning af post %s i %s\n" msgid "error(%d) removing record %s from %s\n" msgstr "fejl(%d) ved fjernelse af post %s fra %s\n" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "der er ikke sat nogen dbpath\n" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" @@ -3121,118 +3126,118 @@ msgstr "" "database med det nye format\n" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, c-format msgid "error(%d) counting packages\n" msgstr "fejl(%d) ved optælling af pakker\n" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "post nummer %d i databasen er fejlbehæftet -- overspringer.\n" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: kan ikke læse hoved ved 0x%x\n" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "fjerner \"%s\" fra %s-indekset.\n" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing %d entries from %s index.\n" msgstr "fjerne %d indgange fra %s-indekset.\n" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "fejl(%d) under allokering af ny pakkeinstans\n" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" "tilføjer \"%s\" til '%s'-indekset.\n" "\n" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, c-format msgid "adding %d entries to %s index.\n" msgstr "tilføjer %d indgange til '%s'-indekset.\n" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "fjerner %s efter vellykket genopbygning af db3.\n" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "der ikke sat nogen dbpath" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "genopbygger database %s over i %s\n" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "den midlertidige database %s eksisterer allerede\n" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, c-format msgid "creating directory %s\n" msgstr "" "opretter kataloget %s\n" "\n" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, c-format msgid "creating directory %s: %s\n" msgstr "opretter kataloget %s: %s\n" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "åbner gammel database med dbapi %d\n" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "åbner ny database med dbapi %d\n" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "kunne ikke tilføje posten, der tidligere var ved %d\n" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "kunne ikke genopbygge database: original-databasen beholdes\n" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "kunne ikke erstatte gammel database med ny database!\n" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "erstat filer i %s med filer fra %s for at genoprette" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, c-format msgid "removing directory %s\n" msgstr "fjerner kataloget %s\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunne ikke fjerne katalog %s: %s\n" @@ -3444,6 +3449,12 @@ msgstr "url-port skal være et tal\n" msgid "failed to create %s: %s\n" msgstr "kunne ikke oprette %s: %s\n" +#~ msgid "cannot open rpm database in %s\n" +#~ msgstr "kan ikke åbne rpm-database i %s\n" + +#~ msgid "cannot open %s/packages.rpm\n" +#~ msgstr "kunne ikke åbne %s/packages.rpm\n" + #~ msgid "add a signature to a package" #~ msgstr "tilføj signatur til pakke" @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n" "Language-Team: German <de@li.org>\n" @@ -45,78 +45,73 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:37 -#, fuzzy, c-format -msgid "cannot open rpm database in %s\n" -msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" - -#: build.c:48 +#: build.c:36 #, fuzzy msgid "failed build dependencies:\n" msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n" # , c-format -#: build.c:81 +#: build.c:65 #, fuzzy, c-format msgid "Unable to open spec file %s: %s\n" msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s." # , c-format -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, fuzzy, c-format msgid "Failed to open tar pipe: %m\n" msgstr "Öffnen von %s fehlgeschlagen\n" # , c-format #. Give up -#: build.c:178 +#: build.c:162 #, fuzzy, c-format msgid "Failed to read spec file from %s\n" msgstr "Lesen von %s fehlgeschlagen: %s." # , c-format -#: build.c:206 +#: build.c:190 #, fuzzy, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "Lesen von %s fehlgeschlagen: %s." # , c-format -#: build.c:245 +#: build.c:229 #, fuzzy, c-format msgid "failed to stat %s: %m\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build.c:250 +#: build.c:234 #, fuzzy, c-format msgid "File %s is not a regular file.\n" msgstr "%s scheint kein RPM-Paket zu sein\n" -#: build.c:259 +#: build.c:243 #, fuzzy, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "%s scheint kein RPM-Paket zu sein\n" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:329 +#: build.c:316 #, fuzzy, c-format msgid "Building for target %s\n" msgstr "Fehler beim Suchen nach Paket %s\n" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 #, fuzzy msgid "error reading header from package\n" msgstr "Fehler beim Suchen nach Paket %s\n" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, fuzzy, c-format msgid "cannot re-open payload: %s\n" msgstr "kann Datei %s nicht öffnen: " @@ -466,45 +461,45 @@ msgstr "--sign darf nur während der Paketerstellung benutzt werden" msgid "exec failed\n" msgstr "%s: Öffnen fehlgeschlagen\n" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "Es wurden keine Paketdateien für die Neuerstellung angegeben" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "Es wurde kein spec-Datei für die Erstellung angegeben" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "Es wurde keine tar-Datei für die Erstellung angegeben" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "Es wurden keine Pakete für die Deinstallation angegeben" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "Es wurden keine Pakete für die Installation angegeben" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "Es wurden keine Argumente für die Anfrage angegeben" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "Es wurden keine Argumente für die Überprüfung angegeben" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "Unerwartete Argumente zu --querytags " -#: rpmqv.c:1156 +#: rpmqv.c:1149 #, fuzzy msgid "no arguments given" msgstr "Es wurden keine Argumente für die Anfrage angegeben" # , c-format -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 #, fuzzy msgid "Unable to open temp file.\n" msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s." @@ -728,7 +723,7 @@ msgid "Could not open %%files file %s: %s\n" msgstr "Fehler: kann Datei %s nicht öffnen\n" # , c-format -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, fuzzy, c-format msgid "line: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" @@ -808,170 +803,170 @@ msgid "Could not canonicalize hostname: %s\n" msgstr "" # , c-format -#: build/pack.c:81 +#: build/pack.c:79 #, fuzzy, c-format msgid "create archive failed on file %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: build/pack.c:84 +#: build/pack.c:82 #, fuzzy, c-format msgid "create archive failed: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/pack.c:106 +#: build/pack.c:104 #, fuzzy, c-format msgid "cpio_copy write failed: %s\n" msgstr "lesen fehlgeschlagen: %s (%d)" -#: build/pack.c:113 +#: build/pack.c:111 #, fuzzy, c-format msgid "cpio_copy read failed: %s\n" msgstr "lesen fehlgeschlagen: %s (%d)" -#: build/pack.c:216 +#: build/pack.c:214 #, fuzzy, c-format msgid "Could not open PreIn file: %s\n" msgstr "Fehler: kann Datei %s nicht öffnen\n" -#: build/pack.c:223 +#: build/pack.c:221 #, fuzzy, c-format msgid "Could not open PreUn file: %s\n" msgstr "Fehler: kann Datei %s nicht öffnen\n" -#: build/pack.c:230 +#: build/pack.c:228 #, fuzzy, c-format msgid "Could not open PostIn file: %s\n" msgstr "Fehler: kann Datei %s nicht öffnen\n" -#: build/pack.c:237 +#: build/pack.c:235 #, fuzzy, c-format msgid "Could not open PostUn file: %s\n" msgstr "Fehler: kann Datei %s nicht öffnen\n" -#: build/pack.c:245 +#: build/pack.c:243 #, fuzzy, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "Fehler: kann Datei %s nicht öffnen\n" -#: build/pack.c:260 +#: build/pack.c:258 #, fuzzy, c-format msgid "Could not open Trigger script file: %s\n" msgstr "Fehler: kann Datei %s nicht öffnen\n" # , c-format -#: build/pack.c:288 +#: build/pack.c:286 #, fuzzy, c-format msgid "readRPM: open %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: build/pack.c:298 +#: build/pack.c:296 #, fuzzy, c-format msgid "readRPM: read %s: %s\n" msgstr "Lesen von %s fehlgeschlagen: %s." -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, fuzzy, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: build/pack.c:341 +#: build/pack.c:333 #, fuzzy, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "Fehler: %s scheint zu keinem RPM-Paket zu gehören\n" -#: build/pack.c:350 +#: build/pack.c:342 #, fuzzy, c-format msgid "readRPM: reading header from %s\n" msgstr "Fehler beim Eintrag %s von %s" # , c-format -#: build/pack.c:475 +#: build/pack.c:467 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "Nicht möglich %s zu schreiben" # , c-format -#: build/pack.c:493 +#: build/pack.c:485 #, fuzzy msgid "Unable to write temp header\n" msgstr "Nicht möglich %s zu schreiben" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "" # , c-format -#: build/pack.c:536 +#: build/pack.c:528 #, fuzzy msgid "Unable to write final header\n" msgstr "Nicht möglich %s zu schreiben" -#: build/pack.c:554 +#: build/pack.c:546 #, fuzzy, c-format msgid "Generating signature: %d\n" msgstr "PGP-Signatur generieren" # , c-format -#: build/pack.c:567 +#: build/pack.c:559 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "Nicht möglich %s zu schreiben" # , c-format -#: build/pack.c:575 +#: build/pack.c:567 #, fuzzy, c-format msgid "Could not open %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen\n" # , c-format -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nicht möglich %s zu schreiben" # , c-format -#: build/pack.c:626 +#: build/pack.c:618 #, fuzzy, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "Nicht möglich %s zu schreiben" # , c-format -#: build/pack.c:636 +#: build/pack.c:628 #, fuzzy, c-format msgid "Unable to read header from %s: %s\n" msgstr "Nicht möglich %s zu schreiben" # , c-format -#: build/pack.c:650 +#: build/pack.c:642 #, fuzzy, c-format msgid "Unable to write header to %s: %s\n" msgstr "Nicht möglich %s zu schreiben" # , c-format -#: build/pack.c:660 +#: build/pack.c:652 #, fuzzy, c-format msgid "Unable to read payload from %s: %s\n" msgstr "Nicht möglich %s zu schreiben" # , c-format -#: build/pack.c:666 +#: build/pack.c:658 #, fuzzy, c-format msgid "Unable to write payload to %s: %s\n" msgstr "Nicht möglich %s zu schreiben" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:775 +#: build/pack.c:767 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "kann Datei %s nicht öffnen: " @@ -1574,72 +1569,92 @@ msgid " failed - " msgstr "pgp fehlgeschlagen" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, fuzzy, c-format +msgid "cannot open Packages database in %s\n" +msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, fuzzy, c-format +msgid "package %s already added, ignoring\n" +msgstr "Paket %s ist nicht installiert\n" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" @@ -1647,43 +1662,43 @@ msgstr "die Datei »%s« gehört zu keinem Paket\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, 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:1535 +#: lib/depends.c:1747 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" # FIXME -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2474,67 +2489,67 @@ msgstr "kann Datei %s nicht öffnen: " msgid "cannot write to %%%s %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1329 #, fuzzy msgid "source package contains no .spec file\n" msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "Keine Stufen ausführen" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "Ausführung des Skripts fehlgeschlagen" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "Ausführung des Skripts fehlgeschlagen" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp fehlgeschlagen" @@ -2584,8 +2599,8 @@ msgstr "Paket hat keinen Namen" msgid "can't query %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" @@ -2599,7 +2614,7 @@ msgstr "Anfrage von %s fehlgeschlagen\n" msgid "old format source packages cannot be queried\n" msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: »readLead« fehlgeschlagen\n" @@ -2661,7 +2676,7 @@ msgstr "ungültige Paket-Nummer: %s\n" msgid "record %u could not be read\n" msgstr "Eintrag %d konnte nicht gelesen werden\n" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "Paket %s ist nicht installiert\n" @@ -2740,59 +2755,54 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "Es wurden keine Pakete für die Installation angegeben" -#: lib/rpminstall.c:228 -#, fuzzy, c-format -msgid "cannot open Packages database in %s\n" -msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" - # , c-format -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "Hole %s heraus\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "Paket %s ist nicht installiert\n" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "Fehler: %s kann nicht installiert werden\n" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 #, fuzzy msgid "installing binary packages\n" msgstr "Paket installieren" @@ -2802,27 +2812,22 @@ msgstr "Paket installieren" msgid "cannot open file %s: %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/rpminstall.c:611 -#, fuzzy, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" bezeichnet mehrere Pakete\n" # oder besser: "... verletzen" ? -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "Installiere %s\n" @@ -3092,7 +3097,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" @@ -3297,131 +3302,131 @@ msgstr "Fehler bei Schreiben des Eintrags %s nach %s" msgid "error(%d) removing record %s from %s\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 #, fuzzy msgid "no dbpath has been set\n" msgstr "»dbpath« ist nicht gesetzt" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, fuzzy, c-format msgid "error(%d) counting packages\n" msgstr "Fehler beim Suchen nach Paket %s\n" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" "Eintrag Nummer %d in der Datenback ist nicht in Ordnung -- wird übersprungen" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen" # FIXME -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" # FIXME -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "Fehler beim Suchen nach Paket %s\n" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" # FIXME -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "»dbpath« ist nicht gesetzt" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "die temporäre Datenbank %s existiert schon" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" # , c-format -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" @@ -3646,6 +3651,14 @@ msgstr "Fehler: der FTP-Port muss eine Zahl sein\n" msgid "failed to create %s: %s\n" msgstr "anlegen von %s fehlgeschlagen\n" +#, fuzzy +#~ msgid "cannot open rpm database in %s\n" +#~ msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" + +#, fuzzy +#~ msgid "cannot open %s/packages.rpm\n" +#~ msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" + #~ msgid "add a signature to a package" #~ msgstr "Signatur einem Paket hinzufügen" diff --git a/po/en_RN.po b/po/en_RN.po index 285b4d05b..9935eb869 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-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -14,71 +14,66 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:37 -#, c-format -msgid "cannot open rpm database in %s\n" -msgstr "" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "" #. Give up -#: build.c:178 +#: build.c:162 #, c-format msgid "Failed to read spec file from %s\n" msgstr "" -#: build.c:206 +#: build.c:190 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "" -#: build.c:245 +#: build.c:229 #, c-format msgid "failed to stat %s: %m\n" msgstr "" -#: build.c:250 +#: build.c:234 #, c-format msgid "File %s is not a regular file.\n" msgstr "" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "" @@ -397,43 +392,43 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1156 +#: rpmqv.c:1149 msgid "no arguments given" msgstr "" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 msgid "Unable to open temp file.\n" msgstr "" @@ -641,7 +636,7 @@ msgstr "" msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" @@ -716,152 +711,152 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:79 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "" -#: build/pack.c:84 +#: build/pack.c:82 #, c-format msgid "create archive failed: %s\n" msgstr "" -#: build/pack.c:106 +#: build/pack.c:104 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "" -#: build/pack.c:113 +#: build/pack.c:111 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "" -#: build/pack.c:216 +#: build/pack.c:214 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "" -#: build/pack.c:230 +#: build/pack.c:228 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "" -#: build/pack.c:237 +#: build/pack.c:235 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "" -#: build/pack.c:245 +#: build/pack.c:243 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "" -#: build/pack.c:260 +#: build/pack.c:258 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:475 +#: build/pack.c:467 msgid "Unable to create immutable header region.\n" msgstr "" -#: build/pack.c:493 +#: build/pack.c:485 msgid "Unable to write temp header\n" msgstr "" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:536 +#: build/pack.c:528 msgid "Unable to write final header\n" msgstr "" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "" -#: build/pack.c:567 +#: build/pack.c:559 msgid "Unable to reload signature header.\n" msgstr "" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" -#: build/pack.c:626 +#: build/pack.c:618 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "" -#: build/pack.c:636 +#: build/pack.c:628 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "" -#: build/pack.c:650 +#: build/pack.c:642 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "" -#: build/pack.c:660 +#: build/pack.c:652 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "" -#: build/pack.c:666 +#: build/pack.c:658 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "" @@ -1416,72 +1411,92 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, c-format +msgid "cannot open Packages database in %s\n" +msgstr "" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, c-format +msgid "package %s already added, ignoring\n" +msgstr "" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1489,42 +1504,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2241,64 +2256,64 @@ msgstr "" msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1329 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr "" -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2346,8 +2361,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2361,7 +2376,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2420,7 +2435,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2496,58 +2511,53 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:228 -#, c-format -msgid "cannot open Packages database in %s\n" -msgstr "" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "" @@ -2556,26 +2566,21 @@ msgstr "" msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "" @@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3029,125 +3034,125 @@ msgstr "" msgid "error(%d) removing record %s from %s\n" msgstr "" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, c-format msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -14,71 +14,66 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:37 -#, c-format -msgid "cannot open rpm database in %s\n" -msgstr "" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "" #. Give up -#: build.c:178 +#: build.c:162 #, c-format msgid "Failed to read spec file from %s\n" msgstr "" -#: build.c:206 +#: build.c:190 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "" -#: build.c:245 +#: build.c:229 #, c-format msgid "failed to stat %s: %m\n" msgstr "" -#: build.c:250 +#: build.c:234 #, c-format msgid "File %s is not a regular file.\n" msgstr "" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "" @@ -397,43 +392,43 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1156 +#: rpmqv.c:1149 msgid "no arguments given" msgstr "" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 msgid "Unable to open temp file.\n" msgstr "" @@ -641,7 +636,7 @@ msgstr "" msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" @@ -716,152 +711,152 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:79 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "" -#: build/pack.c:84 +#: build/pack.c:82 #, c-format msgid "create archive failed: %s\n" msgstr "" -#: build/pack.c:106 +#: build/pack.c:104 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "" -#: build/pack.c:113 +#: build/pack.c:111 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "" -#: build/pack.c:216 +#: build/pack.c:214 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "" -#: build/pack.c:230 +#: build/pack.c:228 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "" -#: build/pack.c:237 +#: build/pack.c:235 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "" -#: build/pack.c:245 +#: build/pack.c:243 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "" -#: build/pack.c:260 +#: build/pack.c:258 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:475 +#: build/pack.c:467 msgid "Unable to create immutable header region.\n" msgstr "" -#: build/pack.c:493 +#: build/pack.c:485 msgid "Unable to write temp header\n" msgstr "" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:536 +#: build/pack.c:528 msgid "Unable to write final header\n" msgstr "" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "" -#: build/pack.c:567 +#: build/pack.c:559 msgid "Unable to reload signature header.\n" msgstr "" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" -#: build/pack.c:626 +#: build/pack.c:618 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "" -#: build/pack.c:636 +#: build/pack.c:628 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "" -#: build/pack.c:650 +#: build/pack.c:642 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "" -#: build/pack.c:660 +#: build/pack.c:652 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "" -#: build/pack.c:666 +#: build/pack.c:658 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "" @@ -1416,72 +1411,92 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, c-format +msgid "cannot open Packages database in %s\n" +msgstr "" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, c-format +msgid "package %s already added, ignoring\n" +msgstr "" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1489,42 +1504,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2241,64 +2256,64 @@ msgstr "" msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1329 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr "" -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2346,8 +2361,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2361,7 +2376,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2420,7 +2435,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2496,58 +2511,53 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:228 -#, c-format -msgid "cannot open Packages database in %s\n" -msgstr "" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "" @@ -2556,26 +2566,21 @@ msgstr "" msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "" @@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3029,125 +3034,125 @@ msgstr "" msgid "error(%d) removing record %s from %s\n" msgstr "" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, c-format msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/eu_ES.po b/po/eu_ES.po index 285b4d05b..9935eb869 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-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -14,71 +14,66 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:37 -#, c-format -msgid "cannot open rpm database in %s\n" -msgstr "" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "" #. Give up -#: build.c:178 +#: build.c:162 #, c-format msgid "Failed to read spec file from %s\n" msgstr "" -#: build.c:206 +#: build.c:190 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "" -#: build.c:245 +#: build.c:229 #, c-format msgid "failed to stat %s: %m\n" msgstr "" -#: build.c:250 +#: build.c:234 #, c-format msgid "File %s is not a regular file.\n" msgstr "" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "" @@ -397,43 +392,43 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1156 +#: rpmqv.c:1149 msgid "no arguments given" msgstr "" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 msgid "Unable to open temp file.\n" msgstr "" @@ -641,7 +636,7 @@ msgstr "" msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" @@ -716,152 +711,152 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:79 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "" -#: build/pack.c:84 +#: build/pack.c:82 #, c-format msgid "create archive failed: %s\n" msgstr "" -#: build/pack.c:106 +#: build/pack.c:104 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "" -#: build/pack.c:113 +#: build/pack.c:111 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "" -#: build/pack.c:216 +#: build/pack.c:214 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "" -#: build/pack.c:230 +#: build/pack.c:228 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "" -#: build/pack.c:237 +#: build/pack.c:235 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "" -#: build/pack.c:245 +#: build/pack.c:243 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "" -#: build/pack.c:260 +#: build/pack.c:258 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:475 +#: build/pack.c:467 msgid "Unable to create immutable header region.\n" msgstr "" -#: build/pack.c:493 +#: build/pack.c:485 msgid "Unable to write temp header\n" msgstr "" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:536 +#: build/pack.c:528 msgid "Unable to write final header\n" msgstr "" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "" -#: build/pack.c:567 +#: build/pack.c:559 msgid "Unable to reload signature header.\n" msgstr "" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" -#: build/pack.c:626 +#: build/pack.c:618 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "" -#: build/pack.c:636 +#: build/pack.c:628 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "" -#: build/pack.c:650 +#: build/pack.c:642 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "" -#: build/pack.c:660 +#: build/pack.c:652 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "" -#: build/pack.c:666 +#: build/pack.c:658 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "" @@ -1416,72 +1411,92 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, c-format +msgid "cannot open Packages database in %s\n" +msgstr "" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, c-format +msgid "package %s already added, ignoring\n" +msgstr "" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1489,42 +1504,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2241,64 +2256,64 @@ msgstr "" msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1329 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr "" -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2346,8 +2361,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2361,7 +2376,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2420,7 +2435,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2496,58 +2511,53 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:228 -#, c-format -msgid "cannot open Packages database in %s\n" -msgstr "" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "" @@ -2556,26 +2566,21 @@ msgstr "" msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "" @@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3029,125 +3034,125 @@ msgstr "" msgid "error(%d) removing record %s from %s\n" msgstr "" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, c-format msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -1,79 +1,74 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n" "Language-Team: Finnish <linux@sot.com>\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" -#: build.c:37 -#, fuzzy, c-format -msgid "cannot open rpm database in %s\n" -msgstr "virhe: en voi avata %s%s/packages.rpm\n" - -#: build.c:48 +#: build.c:36 #, fuzzy msgid "failed build dependencies:\n" msgstr "puuttuvat riippuvuudet:\n" -#: build.c:81 +#: build.c:65 #, fuzzy, c-format msgid "Unable to open spec file %s: %s\n" msgstr "En voi avata %s luettavaksi: %s." -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, fuzzy, c-format msgid "Failed to open tar pipe: %m\n" msgstr "%s:n avaus epäonnistui\n" #. Give up -#: build.c:178 +#: build.c:162 #, fuzzy, c-format msgid "Failed to read spec file from %s\n" msgstr "En voi lukea %s: %s." -#: build.c:206 +#: build.c:190 #, fuzzy, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "En voi lukea %s: %s." -#: build.c:245 +#: build.c:229 #, fuzzy, c-format msgid "failed to stat %s: %m\n" msgstr "en voinut avata %s: %s" -#: build.c:250 +#: build.c:234 #, fuzzy, c-format msgid "File %s is not a regular file.\n" msgstr "%s ei vaikuta RPM-paketilta\n" -#: build.c:259 +#: build.c:243 #, fuzzy, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "%s ei vaikuta RPM-paketilta\n" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:329 +#: build.c:316 #, fuzzy, c-format msgid "Building for target %s\n" msgstr "virhe etsittäessä pakettia %s\n" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 #, fuzzy msgid "error reading header from package\n" msgstr "virhe etsittäessä pakettia %s\n" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, fuzzy, c-format msgid "cannot re-open payload: %s\n" msgstr "en voinut avata tiedostoa %s: " @@ -405,44 +400,44 @@ msgstr "--sign: voidaan käyttää vain paketteja käännettäessä" msgid "exec failed\n" msgstr "%s: avaus ei onnistunut\n" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "uudelleenkäännolle ei määritelty paketteja" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "käännökselle ei annettu määrittelytiedostoja" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "käännökselle ei määritelty tar-tiedostoja" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "poistolle ei määritelty paketteja" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "asennukselle ei määritelty paketteja" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "kyselylle ei annettu parametrejä" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "tarkistukselle ei annettu parametrejä" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "--querytags: odottamattomia parametrejä" -#: rpmqv.c:1156 +#: rpmqv.c:1149 #, fuzzy msgid "no arguments given" msgstr "kyselylle ei annettu parametrejä" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 #, fuzzy msgid "Unable to open temp file.\n" msgstr "En voi avata %s luettavaksi: %s." @@ -656,7 +651,7 @@ msgstr "Tiedostoa ei löytynyt palvelimelta" msgid "Could not open %%files file %s: %s\n" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, fuzzy, c-format msgid "line: %s\n" msgstr "en voinut avata %s: %s" @@ -731,156 +726,156 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:79 #, fuzzy, c-format msgid "create archive failed on file %s: %s\n" msgstr "en voinut avata %s: %s" -#: build/pack.c:84 +#: build/pack.c:82 #, fuzzy, c-format msgid "create archive failed: %s\n" msgstr "en voinut avata %s: %s" -#: build/pack.c:106 +#: build/pack.c:104 #, fuzzy, c-format msgid "cpio_copy write failed: %s\n" msgstr "luku epäonnistui: %s (%d)" -#: build/pack.c:113 +#: build/pack.c:111 #, fuzzy, c-format msgid "cpio_copy read failed: %s\n" msgstr "luku epäonnistui: %s (%d)" -#: build/pack.c:216 +#: build/pack.c:214 #, fuzzy, c-format msgid "Could not open PreIn file: %s\n" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/pack.c:223 +#: build/pack.c:221 #, fuzzy, c-format msgid "Could not open PreUn file: %s\n" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/pack.c:230 +#: build/pack.c:228 #, fuzzy, c-format msgid "Could not open PostIn file: %s\n" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/pack.c:237 +#: build/pack.c:235 #, fuzzy, c-format msgid "Could not open PostUn file: %s\n" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/pack.c:245 +#: build/pack.c:243 #, fuzzy, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/pack.c:260 +#: build/pack.c:258 #, fuzzy, c-format msgid "Could not open Trigger script file: %s\n" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/pack.c:288 +#: build/pack.c:286 #, fuzzy, c-format msgid "readRPM: open %s: %s\n" msgstr "en voinut avata %s: %s" -#: build/pack.c:298 +#: build/pack.c:296 #, fuzzy, c-format msgid "readRPM: read %s: %s\n" msgstr "En voi lukea %s: %s." -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, fuzzy, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: readLead epäonnistui\n" -#: build/pack.c:341 +#: build/pack.c:333 #, fuzzy, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "virhe: %s ei vaikuta RPM paketilta\n" -#: build/pack.c:350 +#: build/pack.c:342 #, fuzzy, c-format msgid "readRPM: reading header from %s\n" msgstr "virhe luettaessa tietuetta %s %s:stä" -#: build/pack.c:475 +#: build/pack.c:467 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:493 +#: build/pack.c:485 #, fuzzy msgid "Unable to write temp header\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:536 +#: build/pack.c:528 #, fuzzy msgid "Unable to write final header\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:554 +#: build/pack.c:546 #, fuzzy, c-format msgid "Generating signature: %d\n" msgstr "generoi PGP-allekirjoitus" -#: build/pack.c:567 +#: build/pack.c:559 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:575 +#: build/pack.c:567 #, fuzzy, c-format msgid "Could not open %s: %s\n" msgstr "%s:n avaus epäonnistui\n" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:626 +#: build/pack.c:618 #, fuzzy, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:636 +#: build/pack.c:628 #, fuzzy, c-format msgid "Unable to read header from %s: %s\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:650 +#: build/pack.c:642 #, fuzzy, c-format msgid "Unable to write header to %s: %s\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:660 +#: build/pack.c:652 #, fuzzy, c-format msgid "Unable to read payload from %s: %s\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:666 +#: build/pack.c:658 #, fuzzy, c-format msgid "Unable to write payload to %s: %s\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:775 +#: build/pack.c:767 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "en voinut avata tiedostoa %s: " @@ -1457,72 +1452,92 @@ msgid " failed - " msgstr "pgp epäonnistui" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, fuzzy, c-format +msgid "cannot open Packages database in %s\n" +msgstr "virhe: en voi avata %s%s/packages.rpm\n" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, fuzzy, c-format +msgid "package %s already added, ignoring\n" +msgstr "paketti %s ei ole asennettu\n" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "tiedostoa %s ei omista mikään paketti\n" @@ -1530,42 +1545,42 @@ msgstr "tiedostoa %s ei omista mikään paketti\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, 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:1535 +#: lib/depends.c:1747 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2334,65 +2349,65 @@ msgstr "en voinut avata tiedostoa %s: " msgid "cannot write to %%%s %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1329 #, fuzzy msgid "source package contains no .spec file\n" msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "älä suorita mitään vaiheita" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "skriptin ajo epäonnistui" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "skriptin ajo epäonnistui" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr "" -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp epäonnistui" @@ -2442,8 +2457,8 @@ msgstr "paketilla ei ole nimeä" msgid "can't query %s: %s\n" msgstr "virhe: en voi avata %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" @@ -2457,7 +2472,7 @@ msgstr "%s:n kysely ei onnistunut\n" msgid "old format source packages cannot be queried\n" msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: readLead epäonnistui\n" @@ -2517,7 +2532,7 @@ msgstr "virheellinen paketin numero: %s\n" msgid "record %u could not be read\n" msgstr "tietuetta %d ei voitu lukea\n" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "paketti %s ei ole asennettu\n" @@ -2596,58 +2611,53 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "asennukselle ei määritelty paketteja" -#: lib/rpminstall.c:228 -#, fuzzy, c-format -msgid "cannot open Packages database in %s\n" -msgstr "virhe: en voi avata %s%s/packages.rpm\n" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "Haen: %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "virhe: %s ei voida asentaa\n" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "puuttuvat riippuvuudet:\n" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 #, fuzzy msgid "installing binary packages\n" msgstr "asenna paketti" @@ -2657,26 +2667,21 @@ msgstr "asenna paketti" msgid "cannot open file %s: %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/rpminstall.c:611 -#, fuzzy, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "virhe: en voi avata %s%s/packages.rpm\n" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" määrittää useita paketteja\n" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "virhe: en voi avata %s\n" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "Asennan: %s\n" @@ -2943,7 +2948,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" @@ -3146,126 +3151,126 @@ msgstr "virhe talletettaessa tietuetta %s %s:ään" msgid "error(%d) removing record %s from %s\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath ei ole asetettu" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, fuzzy, c-format msgid "error(%d) counting packages\n" msgstr "virhe etsittäessä pakettia %s\n" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "en voi lukea headeria %d:stä päivittäessä" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "virhe etsittäessä pakettia %s\n" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "dbpath ei ole asetettu" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "väliaikainen tietokanta %s on jo olemassa" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "en voi lisätä tietuetta %d:stä" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "en voinut avata %s: %s" @@ -3488,6 +3493,14 @@ msgstr "virhe: ftpport pitää olla luku\n" msgid "failed to create %s: %s\n" msgstr "%s:n luonti epäonnistui\n" +#, fuzzy +#~ msgid "cannot open rpm database in %s\n" +#~ msgstr "virhe: en voi avata %s%s/packages.rpm\n" + +#, fuzzy +#~ msgid "cannot open %s/packages.rpm\n" +#~ msgstr "virhe: en voi avata %s%s/packages.rpm\n" + #~ msgid "add a signature to a package" #~ msgstr "lisää allekirjoitus pakettiin" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -14,72 +14,67 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:37 -#, fuzzy, c-format -msgid "cannot open rpm database in %s\n" -msgstr "impossible d'ouvrir: %s\n" - -#: build.c:48 +#: build.c:36 #, fuzzy msgid "failed build dependencies:\n" msgstr "impossible d'ouvrir: %s\n" -#: build.c:81 +#: build.c:65 #, fuzzy, c-format msgid "Unable to open spec file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, fuzzy, c-format msgid "Failed to open tar pipe: %m\n" msgstr "impossible d'ouvrir: %s\n" #. Give up -#: build.c:178 +#: build.c:162 #, fuzzy, c-format msgid "Failed to read spec file from %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build.c:206 +#: build.c:190 #, fuzzy, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "impossible d'ouvrir: %s\n" -#: build.c:245 +#: build.c:229 #, fuzzy, c-format msgid "failed to stat %s: %m\n" msgstr "impossible d'ouvrir: %s\n" -#: build.c:250 +#: build.c:234 #, fuzzy, c-format msgid "File %s is not a regular file.\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:329 +#: build.c:316 #, fuzzy, c-format msgid "Building for target %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, fuzzy, c-format msgid "cannot re-open payload: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -444,45 +439,45 @@ msgstr "--sign ne peut tre spcifi que lors de la construction d'un package" msgid "exec failed\n" msgstr "La construction a chou.\n" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "aucun package n'a t spcifi pour la reconstruction" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "aucun package n'a t spcifi pour la construction" -#: rpmqv.c:1040 +#: rpmqv.c:1033 #, fuzzy msgid "no tar files given for build" msgstr "aucun package n'a t spcifi pour la construction" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "aucun package n'a t spcifi pour l'installation" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "aucun argument n'a t fourni pour la requte" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "aucun argument n'a t fourni pour la vrification" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1156 +#: rpmqv.c:1149 #, fuzzy msgid "no arguments given" msgstr "aucun argument n'a t fourni pour la requte" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 #, fuzzy msgid "Unable to open temp file.\n" msgstr "impossible d'ouvrir: %s\n" @@ -691,7 +686,7 @@ msgstr "aucun package n'a t spcifi pour la dsinstallation" msgid "Could not open %%files file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, fuzzy, c-format msgid "line: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -766,156 +761,156 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:79 #, fuzzy, c-format msgid "create archive failed on file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:84 +#: build/pack.c:82 #, fuzzy, c-format msgid "create archive failed: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:106 +#: build/pack.c:104 #, fuzzy, c-format msgid "cpio_copy write failed: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:113 +#: build/pack.c:111 #, fuzzy, c-format msgid "cpio_copy read failed: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:216 +#: build/pack.c:214 #, fuzzy, c-format msgid "Could not open PreIn file: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:223 +#: build/pack.c:221 #, fuzzy, c-format msgid "Could not open PreUn file: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:230 +#: build/pack.c:228 #, fuzzy, c-format msgid "Could not open PostIn file: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:237 +#: build/pack.c:235 #, fuzzy, c-format msgid "Could not open PostUn file: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:245 +#: build/pack.c:243 #, fuzzy, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:260 +#: build/pack.c:258 #, fuzzy, c-format msgid "Could not open Trigger script file: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:288 +#: build/pack.c:286 #, fuzzy, c-format msgid "readRPM: open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:298 +#: build/pack.c:296 #, fuzzy, c-format msgid "readRPM: read %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, fuzzy, c-format msgid "%s: Fseek failed: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:475 +#: build/pack.c:467 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:493 +#: build/pack.c:485 #, fuzzy msgid "Unable to write temp header\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:536 +#: build/pack.c:528 #, fuzzy msgid "Unable to write final header\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:554 +#: build/pack.c:546 #, fuzzy, c-format msgid "Generating signature: %d\n" msgstr " --sign - genre une signature PGP" -#: build/pack.c:567 +#: build/pack.c:559 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:575 +#: build/pack.c:567 #, fuzzy, c-format msgid "Could not open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:626 +#: build/pack.c:618 #, fuzzy, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:636 +#: build/pack.c:628 #, fuzzy, c-format msgid "Unable to read header from %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:650 +#: build/pack.c:642 #, fuzzy, c-format msgid "Unable to write header to %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:660 +#: build/pack.c:652 #, fuzzy, c-format msgid "Unable to read payload from %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:666 +#: build/pack.c:658 #, fuzzy, c-format msgid "Unable to write payload to %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:775 +#: build/pack.c:767 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -1497,72 +1492,92 @@ msgid " failed - " msgstr "La construction a chou.\n" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, fuzzy, c-format +msgid "cannot open Packages database in %s\n" +msgstr "impossible d'ouvrir: %s\n" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, fuzzy, c-format +msgid "package %s already added, ignoring\n" +msgstr "aucun package n'a t spcifi pour l'installation" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1570,42 +1585,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, 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:1535 +#: lib/depends.c:1747 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2387,66 +2402,66 @@ msgstr "impossible d'ouvrir: %s\n" msgid "cannot write to %%%s %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1329 #, fuzzy msgid "source package contains no .spec file\n" msgstr "" " -f <file>+ - interroge le package qui appartient <file>" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "La construction a chou.\n" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr "" -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "La construction a chou.\n" @@ -2496,8 +2511,8 @@ msgstr "aucun package n'a t spcifi pour l'installation" msgid "can't query %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "La construction a chou.\n" @@ -2511,7 +2526,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -2571,7 +2586,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -2649,58 +2664,53 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpminstall.c:228 -#, fuzzy, c-format -msgid "cannot open Packages database in %s\n" -msgstr "impossible d'ouvrir: %s\n" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "" @@ -2709,26 +2719,21 @@ msgstr "" msgid "cannot open file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "" @@ -2992,7 +2997,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3195,125 +3200,125 @@ msgstr "impossible d'ouvrir: %s\n" msgid "error(%d) removing record %s from %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, fuzzy, c-format msgid "error(%d) counting packages\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -3526,6 +3531,10 @@ msgid "failed to create %s: %s\n" msgstr "impossible d'ouvrir: %s\n" #, fuzzy +#~ msgid "cannot open rpm database in %s\n" +#~ msgstr "impossible d'ouvrir: %s\n" + +#, fuzzy #~ msgid "skip any GPG signatures" #~ msgstr " --sign - genre une signature PGP" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n" "Language-Team: Galician <trasno@ceu.fi.udc.es>\n" @@ -9,71 +9,66 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: build.c:37 -#, c-format -msgid "cannot open rpm database in %s\n" -msgstr "" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "" #. Give up -#: build.c:178 +#: build.c:162 #, c-format msgid "Failed to read spec file from %s\n" msgstr "" -#: build.c:206 +#: build.c:190 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "" -#: build.c:245 +#: build.c:229 #, c-format msgid "failed to stat %s: %m\n" msgstr "" -#: build.c:250 +#: build.c:234 #, c-format msgid "File %s is not a regular file.\n" msgstr "" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "" @@ -392,43 +387,43 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1156 +#: rpmqv.c:1149 msgid "no arguments given" msgstr "" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 msgid "Unable to open temp file.\n" msgstr "" @@ -636,7 +631,7 @@ msgstr "" msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" @@ -711,152 +706,152 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:79 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "" -#: build/pack.c:84 +#: build/pack.c:82 #, c-format msgid "create archive failed: %s\n" msgstr "" -#: build/pack.c:106 +#: build/pack.c:104 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "" -#: build/pack.c:113 +#: build/pack.c:111 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "" -#: build/pack.c:216 +#: build/pack.c:214 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "" -#: build/pack.c:230 +#: build/pack.c:228 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "" -#: build/pack.c:237 +#: build/pack.c:235 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "" -#: build/pack.c:245 +#: build/pack.c:243 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "" -#: build/pack.c:260 +#: build/pack.c:258 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:475 +#: build/pack.c:467 msgid "Unable to create immutable header region.\n" msgstr "" -#: build/pack.c:493 +#: build/pack.c:485 msgid "Unable to write temp header\n" msgstr "" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:536 +#: build/pack.c:528 msgid "Unable to write final header\n" msgstr "" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "" -#: build/pack.c:567 +#: build/pack.c:559 msgid "Unable to reload signature header.\n" msgstr "" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" -#: build/pack.c:626 +#: build/pack.c:618 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "" -#: build/pack.c:636 +#: build/pack.c:628 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "" -#: build/pack.c:650 +#: build/pack.c:642 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "" -#: build/pack.c:660 +#: build/pack.c:652 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "" -#: build/pack.c:666 +#: build/pack.c:658 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "" @@ -1411,72 +1406,92 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, c-format +msgid "cannot open Packages database in %s\n" +msgstr "" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, c-format +msgid "package %s already added, ignoring\n" +msgstr "" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1484,42 +1499,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2236,64 +2251,64 @@ msgstr "" msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1329 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr "" -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2341,8 +2356,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2356,7 +2371,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2415,7 +2430,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2491,58 +2506,53 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:228 -#, c-format -msgid "cannot open Packages database in %s\n" -msgstr "" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "" @@ -2551,26 +2561,21 @@ msgstr "" msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "" @@ -2823,7 +2828,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3024,125 +3029,125 @@ msgstr "" msgid "error(%d) removing record %s from %s\n" msgstr "" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, c-format msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -14,71 +14,66 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:37 -#, c-format -msgid "cannot open rpm database in %s\n" -msgstr "" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "" #. Give up -#: build.c:178 +#: build.c:162 #, c-format msgid "Failed to read spec file from %s\n" msgstr "" -#: build.c:206 +#: build.c:190 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "" -#: build.c:245 +#: build.c:229 #, c-format msgid "failed to stat %s: %m\n" msgstr "" -#: build.c:250 +#: build.c:234 #, c-format msgid "File %s is not a regular file.\n" msgstr "" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "" @@ -397,43 +392,43 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1156 +#: rpmqv.c:1149 msgid "no arguments given" msgstr "" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 msgid "Unable to open temp file.\n" msgstr "" @@ -641,7 +636,7 @@ msgstr "" msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" @@ -716,152 +711,152 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:79 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "" -#: build/pack.c:84 +#: build/pack.c:82 #, c-format msgid "create archive failed: %s\n" msgstr "" -#: build/pack.c:106 +#: build/pack.c:104 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "" -#: build/pack.c:113 +#: build/pack.c:111 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "" -#: build/pack.c:216 +#: build/pack.c:214 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "" -#: build/pack.c:230 +#: build/pack.c:228 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "" -#: build/pack.c:237 +#: build/pack.c:235 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "" -#: build/pack.c:245 +#: build/pack.c:243 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "" -#: build/pack.c:260 +#: build/pack.c:258 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:475 +#: build/pack.c:467 msgid "Unable to create immutable header region.\n" msgstr "" -#: build/pack.c:493 +#: build/pack.c:485 msgid "Unable to write temp header\n" msgstr "" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:536 +#: build/pack.c:528 msgid "Unable to write final header\n" msgstr "" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "" -#: build/pack.c:567 +#: build/pack.c:559 msgid "Unable to reload signature header.\n" msgstr "" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" -#: build/pack.c:626 +#: build/pack.c:618 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "" -#: build/pack.c:636 +#: build/pack.c:628 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "" -#: build/pack.c:650 +#: build/pack.c:642 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "" -#: build/pack.c:660 +#: build/pack.c:652 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "" -#: build/pack.c:666 +#: build/pack.c:658 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "" @@ -1416,72 +1411,92 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, c-format +msgid "cannot open Packages database in %s\n" +msgstr "" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, c-format +msgid "package %s already added, ignoring\n" +msgstr "" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1489,42 +1504,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2241,64 +2256,64 @@ msgstr "" msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1329 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr "" -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2346,8 +2361,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2361,7 +2376,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2420,7 +2435,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2496,58 +2511,53 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:228 -#, c-format -msgid "cannot open Packages database in %s\n" -msgstr "" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "" @@ -2556,26 +2566,21 @@ msgstr "" msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "" @@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3029,125 +3034,125 @@ msgstr "" msgid "error(%d) removing record %s from %s\n" msgstr "" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, c-format msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -14,71 +14,66 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:37 -#, c-format -msgid "cannot open rpm database in %s\n" -msgstr "" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "" #. Give up -#: build.c:178 +#: build.c:162 #, c-format msgid "Failed to read spec file from %s\n" msgstr "" -#: build.c:206 +#: build.c:190 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "" -#: build.c:245 +#: build.c:229 #, c-format msgid "failed to stat %s: %m\n" msgstr "" -#: build.c:250 +#: build.c:234 #, c-format msgid "File %s is not a regular file.\n" msgstr "" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "" @@ -397,43 +392,43 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1156 +#: rpmqv.c:1149 msgid "no arguments given" msgstr "" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 msgid "Unable to open temp file.\n" msgstr "" @@ -641,7 +636,7 @@ msgstr "" msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" @@ -716,152 +711,152 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:79 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "" -#: build/pack.c:84 +#: build/pack.c:82 #, c-format msgid "create archive failed: %s\n" msgstr "" -#: build/pack.c:106 +#: build/pack.c:104 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "" -#: build/pack.c:113 +#: build/pack.c:111 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "" -#: build/pack.c:216 +#: build/pack.c:214 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "" -#: build/pack.c:230 +#: build/pack.c:228 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "" -#: build/pack.c:237 +#: build/pack.c:235 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "" -#: build/pack.c:245 +#: build/pack.c:243 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "" -#: build/pack.c:260 +#: build/pack.c:258 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:475 +#: build/pack.c:467 msgid "Unable to create immutable header region.\n" msgstr "" -#: build/pack.c:493 +#: build/pack.c:485 msgid "Unable to write temp header\n" msgstr "" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:536 +#: build/pack.c:528 msgid "Unable to write final header\n" msgstr "" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "" -#: build/pack.c:567 +#: build/pack.c:559 msgid "Unable to reload signature header.\n" msgstr "" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" -#: build/pack.c:626 +#: build/pack.c:618 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "" -#: build/pack.c:636 +#: build/pack.c:628 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "" -#: build/pack.c:650 +#: build/pack.c:642 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "" -#: build/pack.c:660 +#: build/pack.c:652 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "" -#: build/pack.c:666 +#: build/pack.c:658 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "" @@ -1416,72 +1411,92 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, c-format +msgid "cannot open Packages database in %s\n" +msgstr "" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, c-format +msgid "package %s already added, ignoring\n" +msgstr "" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1489,42 +1504,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2241,64 +2256,64 @@ msgstr "" msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1329 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr "" -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2346,8 +2361,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2361,7 +2376,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2420,7 +2435,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2496,58 +2511,53 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:228 -#, c-format -msgid "cannot open Packages database in %s\n" -msgstr "" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "" @@ -2556,26 +2566,21 @@ msgstr "" msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "" @@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3029,125 +3034,125 @@ msgstr "" msgid "error(%d) removing record %s from %s\n" msgstr "" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, c-format msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen <ra@hp.is>\n" "Language-Team: is <kde-isl@mmedia.is>\n" @@ -9,71 +9,66 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:37 -#, c-format -msgid "cannot open rpm database in %s\n" -msgstr "get ekki opnað pakka gagnagrunn í %s\n" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "gat ekki útbúið pakkaskilyrði:\n" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "Get ekki opnað spec skrána %s: %s\n" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "Gat ekki opnað pípu í tar: %m\n" #. Give up -#: build.c:178 +#: build.c:162 #, c-format msgid "Failed to read spec file from %s\n" msgstr "Gat ekki lesið spec skrá frá %s\n" -#: build.c:206 +#: build.c:190 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "Gat ekki endurnefnt %s sem %s: %m\n" -#: build.c:245 +#: build.c:229 #, c-format msgid "failed to stat %s: %m\n" msgstr "gat ekki skoðað %s: %m\n" -#: build.c:250 +#: build.c:234 #, c-format msgid "File %s is not a regular file.\n" msgstr "Skráin %s er ekki venjuleg skrá.\n" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "Skráin %s virðist ekki vera specskrá.\n" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "Þýði fyrir markkerfi: %s\n" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "Þýði fyrir markkerfi %s\n" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "" @@ -392,43 +387,43 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1156 +#: rpmqv.c:1149 msgid "no arguments given" msgstr "" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 msgid "Unable to open temp file.\n" msgstr "Get ekki opnað tempi skrá.\n" @@ -636,7 +631,7 @@ msgstr "Skráin fannst ekki með 'glob': %s\n" msgid "Could not open %%files file %s: %s\n" msgstr "Gat ekki opnað %%files skrána %s: %s\n" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "lína: %s\n" @@ -711,156 +706,156 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:79 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "safnskráarsmíð brást á skrá %s: %s\n" -#: build/pack.c:84 +#: build/pack.c:82 #, c-format msgid "create archive failed: %s\n" msgstr "safnskráarsmíð brást: %s\n" -#: build/pack.c:106 +#: build/pack.c:104 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "" -#: build/pack.c:113 +#: build/pack.c:111 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "" -#: build/pack.c:216 +#: build/pack.c:214 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "Gat ekki opnað PreIn skrá: %s\n" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "Gat ekki opnað PreUn skrá: %s\n" -#: build/pack.c:230 +#: build/pack.c:228 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "Gat ekki opnað PostIn skrá: %s\n" -#: build/pack.c:237 +#: build/pack.c:235 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "Gat ekki opnað PostUn skrá: %s\n" -#: build/pack.c:245 +#: build/pack.c:243 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "Get ekki opnað VerifyScript skrá: %s\n" -#: build/pack.c:260 +#: build/pack.c:258 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: Fseek brást: %s\n" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:475 +#: build/pack.c:467 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "Get ekki lesið haus úr %s: %s\n" -#: build/pack.c:493 +#: build/pack.c:485 #, fuzzy msgid "Unable to write temp header\n" msgstr "Gat ekki ritað haus í %s: %s\n" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:536 +#: build/pack.c:528 #, fuzzy msgid "Unable to write final header\n" msgstr "Gat ekki ritað haus í %s: %s\n" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "" -#: build/pack.c:567 +#: build/pack.c:559 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "Get ekki lesið haus úr %s: %s\n" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "Get ekki ritað í pakka: %s\n" -#: build/pack.c:626 +#: build/pack.c:618 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "Get ekki opnað sigtarget %s: %s\n" -#: build/pack.c:636 +#: build/pack.c:628 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "Get ekki lesið haus úr %s: %s\n" -#: build/pack.c:650 +#: build/pack.c:642 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "Gat ekki ritað haus í %s: %s\n" -#: build/pack.c:660 +#: build/pack.c:652 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "Get ekki lesið innihald %s: %s\n" -#: build/pack.c:666 +#: build/pack.c:658 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "Get ekki ritað innihald í %s: %s\n" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "Skrifaði: %s\n" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "" @@ -1416,72 +1411,92 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, c-format +msgid "cannot open Packages database in %s\n" +msgstr "get ekki opnað pakka gagnagrunn í\n" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, c-format +msgid "package %s already added, ignoring\n" +msgstr "" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1489,42 +1504,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2246,64 +2261,64 @@ msgstr "gat ekki búið til %%%s %s\n" msgid "cannot write to %%%s %s\n" msgstr "get ekki ritað í %%%s %s\n" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1329 msgid "source package contains no .spec file\n" msgstr "pakkinn inniheldur enga .spec skrá\n" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr "" -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "gat ekki opnað %s: %s\n" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s brást\n" @@ -2351,8 +2366,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2366,7 +2381,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: gat ekki lesið manifest: %s\n" @@ -2425,7 +2440,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2501,58 +2516,53 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:228 -#, c-format -msgid "cannot open Packages database in %s\n" -msgstr "get ekki opnað pakka gagnagrunn í\n" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "" @@ -2561,26 +2571,21 @@ msgstr "" msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "get ekki opnað %s/packages.rpm\n" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "" @@ -2833,7 +2838,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3034,125 +3039,125 @@ msgstr "" msgid "error(%d) removing record %s from %s\n" msgstr "" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, c-format msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -3364,6 +3369,12 @@ msgstr "gátt slóðar verður að vera tala\n" msgid "failed to create %s: %s\n" msgstr "gat ekki búið til %s: %s\n" +#~ msgid "cannot open rpm database in %s\n" +#~ msgstr "get ekki opnað pakka gagnagrunn í %s\n" + +#~ msgid "cannot open %s/packages.rpm\n" +#~ msgstr "get ekki opnað %s/packages.rpm\n" + #~ msgid "rpm: %s\n" #~ msgstr "rpm: %s\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -14,71 +14,66 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:37 -#, c-format -msgid "cannot open rpm database in %s\n" -msgstr "" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "" #. Give up -#: build.c:178 +#: build.c:162 #, c-format msgid "Failed to read spec file from %s\n" msgstr "" -#: build.c:206 +#: build.c:190 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "" -#: build.c:245 +#: build.c:229 #, c-format msgid "failed to stat %s: %m\n" msgstr "" -#: build.c:250 +#: build.c:234 #, c-format msgid "File %s is not a regular file.\n" msgstr "" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "" @@ -397,43 +392,43 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1156 +#: rpmqv.c:1149 msgid "no arguments given" msgstr "" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 msgid "Unable to open temp file.\n" msgstr "" @@ -641,7 +636,7 @@ msgstr "" msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" @@ -716,152 +711,152 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:79 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "" -#: build/pack.c:84 +#: build/pack.c:82 #, c-format msgid "create archive failed: %s\n" msgstr "" -#: build/pack.c:106 +#: build/pack.c:104 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "" -#: build/pack.c:113 +#: build/pack.c:111 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "" -#: build/pack.c:216 +#: build/pack.c:214 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "" -#: build/pack.c:230 +#: build/pack.c:228 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "" -#: build/pack.c:237 +#: build/pack.c:235 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "" -#: build/pack.c:245 +#: build/pack.c:243 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "" -#: build/pack.c:260 +#: build/pack.c:258 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:475 +#: build/pack.c:467 msgid "Unable to create immutable header region.\n" msgstr "" -#: build/pack.c:493 +#: build/pack.c:485 msgid "Unable to write temp header\n" msgstr "" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:536 +#: build/pack.c:528 msgid "Unable to write final header\n" msgstr "" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "" -#: build/pack.c:567 +#: build/pack.c:559 msgid "Unable to reload signature header.\n" msgstr "" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" -#: build/pack.c:626 +#: build/pack.c:618 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "" -#: build/pack.c:636 +#: build/pack.c:628 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "" -#: build/pack.c:650 +#: build/pack.c:642 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "" -#: build/pack.c:660 +#: build/pack.c:652 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "" -#: build/pack.c:666 +#: build/pack.c:658 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "" @@ -1416,72 +1411,92 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, c-format +msgid "cannot open Packages database in %s\n" +msgstr "" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, c-format +msgid "package %s already added, ignoring\n" +msgstr "" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1489,42 +1504,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2241,64 +2256,64 @@ msgstr "" msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1329 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr "" -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2346,8 +2361,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2361,7 +2376,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2420,7 +2435,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2496,58 +2511,53 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:228 -#, c-format -msgid "cannot open Packages database in %s\n" -msgstr "" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "" @@ -2556,26 +2566,21 @@ msgstr "" msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "" @@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3029,125 +3034,125 @@ msgstr "" msgid "error(%d) removing record %s from %s\n" msgstr "" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, c-format msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n" "Language-Team: JRPM <jrpm@linux.or.jp>\n" @@ -14,74 +14,69 @@ msgstr "" "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: EUC-JP\n" -#: build.c:37 -#, fuzzy, c-format -msgid "cannot open rpm database in %s\n" -msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó\n" - -#: build.c:48 +#: build.c:36 #, fuzzy msgid "failed build dependencies:\n" msgstr "°Í¸À¤Î·çÇ¡:\n" -#: build.c:81 +#: build.c:65 #, fuzzy, c-format msgid "Unable to open spec file %s: %s\n" msgstr "spec ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó: %s\n" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, fuzzy, c-format msgid "Failed to open tar pipe: %m\n" msgstr "tar ¥Ñ¥¤¥×¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n" #. Give up -#: build.c:178 +#: build.c:162 #, fuzzy, c-format msgid "Failed to read spec file from %s\n" msgstr "%s ¤«¤é spec ¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: build.c:206 +#: build.c:190 #, fuzzy, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "%s ¤ò %s ¤Ë¤¹¤ë̾Á°¤ÎÊѹ¹¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: build.c:245 +#: build.c:229 #, fuzzy, c-format msgid "failed to stat %s: %m\n" msgstr "stat %s ¤Ë¼ºÇÔ: %s" -#: build.c:250 +#: build.c:234 #, fuzzy, c-format msgid "File %s is not a regular file.\n" msgstr "ÉáÄ̤Υե¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s\n" -#: build.c:259 +#: build.c:243 #, fuzzy, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ï ¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹¡£\n" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "ºîÀ®Ã楿¡¼¥²¥Ã¥È¥×¥é¥Ã¥È¥Õ¥©¡¼¥à: %s\n" -#: build.c:329 +#: build.c:316 #, fuzzy, c-format msgid "Building for target %s\n" msgstr "¥¿¡¼¥²¥Ã¥È %s ÍѤ˺îÀ®Ãæ\n" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 #, fuzzy msgid "argument is not an RPM package\n" msgstr "°ú¿ô¤Ï RPM ¥Ñ¥Ã¥±¡¼¥¸¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 #, fuzzy msgid "error reading header from package\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤«¤é¥Ø¥Ã¥À¤ÎÆɤ߹þ¤ß¤Î¥¨¥é¡¼\n" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, fuzzy, c-format msgid "cannot re-open payload: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó" @@ -424,44 +419,44 @@ msgstr "--sign ¤Ï¥Ñ¥Ã¥±¡¼¥¸ºîÀ®»þ¤Î¤ß»ÈÍѤǤ¤Þ¤¹" msgid "exec failed\n" msgstr "¼Â¹Ô¼ºÇÔ\n" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "ºÆºîÀ®¤¹¤ë¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "ºîÀ®¤Î¤¿¤á¤Î spec ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "ºîÀ®(build)¤Î¤¿¤á¤Î tar ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "Ì䤤¹ç¤ï¤»¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "¸¡¾Ú¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "--querytags ¤Î°ú¿ô¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹" -#: rpmqv.c:1156 +#: rpmqv.c:1149 #, fuzzy msgid "no arguments given" msgstr "Ì䤤¹ç¤ï¤»¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 #, fuzzy msgid "Unable to open temp file.\n" msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó" @@ -682,7 +677,7 @@ msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó(by glob): %s" msgid "Could not open %%files file %s: %s\n" msgstr "%%files ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó: %s" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, fuzzy, c-format msgid "line: %s\n" msgstr "¹ÔÌÜ: %s" @@ -757,157 +752,157 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "¥Û¥¹¥È̾¤òÀµ¼°¤Ê¤â¤Î¤Ë¤Ç¤¤Þ¤»¤ó: %s\n" -#: build/pack.c:81 +#: build/pack.c:79 #, fuzzy, c-format msgid "create archive failed on file %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ç¥¢¡¼¥«¥¤¥Ö¤ÎºîÀ®¤Ë¼ºÇÔ: %s" -#: build/pack.c:84 +#: build/pack.c:82 #, fuzzy, c-format msgid "create archive failed: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ç¥¢¡¼¥«¥¤¥Ö¤ÎºîÀ®¤Ë¼ºÇÔ: %s" -#: build/pack.c:106 +#: build/pack.c:104 #, fuzzy, c-format msgid "cpio_copy write failed: %s\n" msgstr "cpio_copy ¤Ç½ñ¤¹þ¤ß¼ºÇÔ: %s" -#: build/pack.c:113 +#: build/pack.c:111 #, fuzzy, c-format msgid "cpio_copy read failed: %s\n" msgstr "cpio_copy ¤ÇÆɤ߹þ¤ß¼ºÇÔ: %s" -#: build/pack.c:216 +#: build/pack.c:214 #, fuzzy, c-format msgid "Could not open PreIn file: %s\n" msgstr "PreIn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿: %s" -#: build/pack.c:223 +#: build/pack.c:221 #, fuzzy, c-format msgid "Could not open PreUn file: %s\n" msgstr "PreUn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿: %s" -#: build/pack.c:230 +#: build/pack.c:228 #, fuzzy, c-format msgid "Could not open PostIn file: %s\n" msgstr "PostIn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿: %s" -#: build/pack.c:237 +#: build/pack.c:235 #, fuzzy, c-format msgid "Could not open PostUn file: %s\n" msgstr "PostUn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿: %s" -#: build/pack.c:245 +#: build/pack.c:243 #, fuzzy, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "VerifyScript ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿: %s" -#: build/pack.c:260 +#: build/pack.c:258 #, fuzzy, c-format msgid "Could not open Trigger script file: %s\n" msgstr "¥È¥ê¥¬¡¼¥¹¥¯¥ê¥×¥È¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿: %s" -#: build/pack.c:288 +#: build/pack.c:286 #, fuzzy, c-format msgid "readRPM: open %s: %s\n" msgstr "readRPM: %s ¤Î¥ª¡¼¥×¥ó: %s\n" -#: build/pack.c:298 +#: build/pack.c:296 #, fuzzy, c-format msgid "readRPM: read %s: %s\n" msgstr "readRPM: %s ¤ÎÆɤ߹þ¤ß: %s\n" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, fuzzy, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: build/pack.c:341 +#: build/pack.c:333 #, fuzzy, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s ¤Ï RPM ¥Ñ¥Ã¥±¡¼¥¸¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: build/pack.c:350 +#: build/pack.c:342 #, fuzzy, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: %s ¤«¤é¤Î¥Ø¥Ã¥À¤ÎÆɤ߹þ¤ß\n" -#: build/pack.c:475 +#: build/pack.c:467 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤¤Þ¤»¤ó: %s" -#: build/pack.c:493 +#: build/pack.c:485 #, fuzzy msgid "Unable to write temp header\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" -#: build/pack.c:501 +#: build/pack.c:493 #, fuzzy msgid "Bad CSA data\n" msgstr "ÉÔÀµ¤Ê CSA ¥Ç¡¼¥¿" -#: build/pack.c:536 +#: build/pack.c:528 #, fuzzy msgid "Unable to write final header\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "½ð̾¤ÎÀ¸À®Ãæ: %d\n" -#: build/pack.c:567 +#: build/pack.c:559 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤¤Þ¤»¤ó: %s" -#: build/pack.c:575 +#: build/pack.c:567 #, fuzzy, c-format msgid "Could not open %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" -#: build/pack.c:626 +#: build/pack.c:618 #, fuzzy, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "sigtarget ¤ÎÆɤ߹þ¤ß¤¬¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿: %s" -#: build/pack.c:636 +#: build/pack.c:628 #, fuzzy, c-format msgid "Unable to read header from %s: %s\n" msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤¤Þ¤»¤ó: %s" -#: build/pack.c:650 +#: build/pack.c:642 #, fuzzy, c-format msgid "Unable to write header to %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" -#: build/pack.c:660 +#: build/pack.c:652 #, fuzzy, c-format msgid "Unable to read payload from %s: %s\n" msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤¤Þ¤»¤ó: %s" -#: build/pack.c:666 +#: build/pack.c:658 #, fuzzy, c-format msgid "Unable to write payload to %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "½ñ¤¹þ¤ßÃæ: %s\n" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î ½ÐÎÏ¥Õ¥¡¥¤¥ë̾¤òÀ¸À®¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿: %s\n" -#: build/pack.c:775 +#: build/pack.c:767 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "%s ¤òºîÀ®¤Ç¤¤Þ¤»¤ó: %s\n" @@ -1489,7 +1484,7 @@ msgid " failed - " msgstr "¼ºÇÔ - " #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -1498,65 +1493,85 @@ msgstr "" "\"B\" ¤Î°Í¸À¤Ï epoch ¤òɬÍפȤ·¤Þ¤¹(\"A\"¤ÈƱ¤¸¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ)\n" "\tA %s\tB %s\n" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, fuzzy, c-format +msgid "cannot open Packages database in %s\n" +msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó\n" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, fuzzy, c-format +msgid "package %s already added, ignoring\n" +msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, fuzzy, c-format msgid "%s: %-45s YES (added files)\n" msgstr "%s: %s ¤Ï¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, fuzzy, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "%s: %s ¤Ï provide ¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %s ¤Ï db ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, fuzzy, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, fuzzy, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %s ¤Ï db ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" @@ -1564,42 +1579,42 @@ msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n" #. conflicts exist. -#: lib/depends.c:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹: %s\n" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2394,67 +2409,67 @@ msgstr "%s ¤òºîÀ®¤Ç¤¤Þ¤»¤ó: %s\n" msgid "cannot write to %%%s %s\n" msgstr "%s ¤Ø½ñ¤¹þ¤á¤Þ¤»¤ó" -#: lib/psm.c:1217 +#: lib/psm.c:1216 #, fuzzy msgid "source package expected, binary found\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Þ¤¹¡¢¥Ð¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Þ¤·¤¿" -#: lib/psm.c:1330 +#: lib/psm.c:1329 #, fuzzy msgid "source package contains no .spec file\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "¥Ý¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "¥æ¡¼¥¶ %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "¥°¥ë¡¼¥× %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿Ä¹¤Ë¼ºÇÔ %s%s: %s" -#: lib/psm.c:2241 +#: lib/psm.c:2240 #, fuzzy msgid " on file " msgstr "¥Õ¥¡¥¤¥ë¾å" -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s ¼ºÇÔ" @@ -2503,8 +2518,8 @@ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ï¥Õ¥¡¥¤¥ë½êͼԤä id ¥ê¥¹¥È¤ò¤É¤Á¤é¤â»ý¤Ã¤Æ¤¤¤Þ¤»¤ó" msgid "can't query %s: %s\n" msgstr "%s ¤òºï½ü(unlink)¤Ç¤¤Þ¤»¤ó: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n" @@ -2518,7 +2533,7 @@ msgstr "%s ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" msgid "old format source packages cannot be queried\n" msgstr "µì·Á¼°¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤ë¤³¤È¤Ï¤Ç¤¤Þ¤»¤ó\n" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" @@ -2578,7 +2593,7 @@ msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥ÉÈÖ¹æ %d\n" msgid "record %u could not be read\n" msgstr "¥ì¥³¡¼¥É %d ¤òÆɤळ¤È¤¬¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿\n" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" @@ -2657,58 +2672,53 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó" -#: lib/rpminstall.c:228 -#, fuzzy, c-format -msgid "cannot open Packages database in %s\n" -msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó\n" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "%s ¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "%s ¤È¤·¤Æ...\n" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s ¤ò¥¹¥¥Ã¥×¤·¤Þ¤¹ - žÁ÷¼ºÇÔ - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ¤Þ¤»¤ó" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤«¤é¤ÎÆɤ߹þ¤ß¥¨¥é¡¼ " -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¤Ï¤è¤ê¿·¤·¤¤ RPM ¤Î¥Ð¡¼¥¸¥ç¥ó¤¬É¬ÍפǤ¹\n" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¤Þ¤»¤ó\n" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿\n" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "°Í¸À¤Î·çÇ¡:\n" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n" @@ -2717,26 +2727,21 @@ msgstr "¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n" msgid "cannot open file %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó: %s" -#: lib/rpminstall.c:611 -#, fuzzy, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó\n" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¤ÏÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹\n" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë¤È°Í¸À¤òÇ˲õ¤·¤Þ¤¹:\n" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó\n" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n" @@ -3003,7 +3008,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥¥Ã¥×¤·¤Þ¤¹\n" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n" @@ -3217,128 +3222,128 @@ msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " msgid "error(%d) removing record %s from %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ëºï½ü¤Ç¥¨¥é¡¼" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, fuzzy, c-format msgid "error(%d) counting packages\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥¥Ã¥×¤·¤Þ¤¹" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "name ¥¤¥ó¥Ç¥Ã¥¯¥¹ºï½ü¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rootdir %s Ãæ¤Ç¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "°ì»þŪ¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "" "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Þ¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ð¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤´¹¤¨¤Þ¤¹" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n" @@ -3562,6 +3567,14 @@ msgstr "url ¥Ý¡¼¥È¤Ï¿ô»ú¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" msgid "failed to create %s: %s\n" msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" +#, fuzzy +#~ msgid "cannot open rpm database in %s\n" +#~ msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó\n" + +#, fuzzy +#~ msgid "cannot open %s/packages.rpm\n" +#~ msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó\n" + #~ msgid "add a signature to a package" #~ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤òÄɲä·¤Þ¤¹" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: 2001-09-07 22:03+0900\n" "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n" "Language-Team: GNU Translation project <ko@li.org>\n" @@ -9,71 +9,66 @@ msgstr "" "Content-Type: text/plain; charset=EUC-KR\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:37 -#, c-format -msgid "cannot open rpm database in %s\n" -msgstr "%s ¿¡¼ rpm µ¥ÀÌÅͺ£À̽º¸¦ ¿ ¼ö ¾ø½À´Ï´Ù\n" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "ÀÇÁ¸¼º ¹®Á¦·Î Á¦ÀÛ¿¡ ½ÇÆÐÇÔ:\n" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "%s spec ÆÄÀÏÀ» ¿ ¼ö ¾øÀ½: %s\n" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "tar ÆÄÀÌÇÁ¸¦ ¿©´Âµ¥ ½ÇÆÐÇÔ: %m\n" #. Give up -#: build.c:178 +#: build.c:162 #, c-format msgid "Failed to read spec file from %s\n" msgstr "%s ¿¡¼ spec ÆÄÀÏÀ» Àдµ¥ ½ÇÆÐÇß½À´Ï´Ù\n" -#: build.c:206 +#: build.c:190 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "%s ¿¡¼ %s (À¸)·Î À̸§ º¯°æÇϴµ¥ ½ÇÆÐÇÔ: %m\n" -#: build.c:245 +#: build.c:229 #, c-format msgid "failed to stat %s: %m\n" msgstr "%s ÀÇ »óÅÂ(stat)¸¦ Ç¥½ÃÇϴµ¥ ½ÇÆÐÇÔ: %m\n" -#: build.c:250 +#: build.c:234 #, c-format msgid "File %s is not a regular file.\n" msgstr "%s ÆÄÀÏÀº Á¤±Ô(regular) ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù.\n" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "%s ÆÄÀÏÀº spec ÆÄÀÏÀÌ ¾Æ´Ñ °Í °°½À´Ï´Ù.\n" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "¸ñÇ¥´ë»ó(target) Ç÷§ÆûÀ¸·Î Á¦ÀÛ Áß: %s\n" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "%s (À»)¸¦ Á¦ÀÛÇÏ°í ÀÖ½À´Ï´Ù\n" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "Àμö·Î RPM ÆÐÅ°Áö°¡ ÁöÁ¤µÇ¾î¾ß ÇÕ´Ï´Ù\n" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "ÆÐÅ°ÁöÀÇ Çì´õ¸¦ Àд µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "payload¸¦ ´Ù½Ã ¿ ¼ö ¾øÀ½: %s\n" @@ -399,44 +394,44 @@ msgstr "--sign ¿É¼ÇÀº ÆÐÅ°Áö Á¦À۽ÿ¡¸¸ »ç¿ëÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù" msgid "exec failed\n" msgstr "½ÇÇà¿¡ ½ÇÆÐÇß½À´Ï´Ù\n" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "ÀçÁ¦ÀÛ(rebuild)ÇÒ ÆÐÅ°Áö ÆÄÀÏÀ» ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "ÆÐÅ°Áö Á¦ÀÛ¿¡ ÇÊ¿äÇÑ spec ÆÄÀÏÀ» ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "ÆÐÅ°Áö Á¦ÀÛ¿¡ ÇÊ¿äÇÑ tar ÆÄÀÏÀ» ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "Á¦°Å(uninstall)ÇÒ ÆÐÅ°Áö¸¦ ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "¼³Ä¡ÇÒ ÆÐÅ°Áö¸¦ ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "ÁúÀÇ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "°ËÁõ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "--querytags ¿É¼Ç¿¡ ºÎÀûÀýÇÑ Àμö°¡ ÁöÁ¤µÇ¾ú½À´Ï´Ù " -#: rpmqv.c:1156 +#: rpmqv.c:1149 #, fuzzy msgid "no arguments given" msgstr "ÁúÀÇ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 msgid "Unable to open temp file.\n" msgstr "Àӽà ÆÄÀÏÀ» ¿ ¼ö ¾ø½À´Ï´Ù.\n" @@ -647,7 +642,7 @@ msgstr "globÀ¸·Î ÆÄÀÏÀ» ãÀ» ¼ö ¾øÀ½: %s\n" msgid "Could not open %%files file %s: %s\n" msgstr "%s ÆÄÀÏÀÇ %%files¸¦ ¿ ¼ö ¾øÀ½: %s\n" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "ÁÙ(line): %s\n" @@ -722,152 +717,152 @@ msgstr "±×·ì id ¼³Á¤[getGidS]: gid°¡ ³Ê¹« ¸¹½À´Ï´Ù\n" msgid "Could not canonicalize hostname: %s\n" msgstr "È£½ºÆ® ¸íÀ» Á¤±ÔÈ(canonicalize) ÇÒ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:81 +#: build/pack.c:79 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "%s ÆÄÀÏ¿¡ ¾ÆÄ«À̺긦 »ý¼ºÇϴµ¥ ½ÇÆÐÇÔ: %s\n" -#: build/pack.c:84 +#: build/pack.c:82 #, c-format msgid "create archive failed: %s\n" msgstr "¾ÆÄ«ÀÌºê »ý¼º¿¡ ½ÇÆÐÇÔ: %s\n" -#: build/pack.c:106 +#: build/pack.c:104 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "cpio_copy ÀÛ¼º¿¡ ½ÇÆÐÇÔ: %s\n" -#: build/pack.c:113 +#: build/pack.c:111 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "cpio_copy Àб⿡ ½ÇÆÐÇÔ: %s\n" -#: build/pack.c:216 +#: build/pack.c:214 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "PreIn ÆÄÀÏÀ» ¿ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "PreUn ÆÄÀÏÀ» ¿ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:230 +#: build/pack.c:228 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "PostIn ÆÄÀÏÀ» ¿ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:237 +#: build/pack.c:235 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "PostUn ÆÄÀÏÀ» ¿ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:245 +#: build/pack.c:243 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "VerifyScript ÆÄÀÏÀ» ¿ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:260 +#: build/pack.c:258 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "Æ®¸®°Å ½ºÅ©¸³Æ® ÆÄÀÏÀ» ¿ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "RPM Àбâ(readRPM): %s (À»)¸¦ ¿±´Ï´Ù: %s\n" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "RPM Àбâ(readRPM): %s (À»)¸¦ ÀнÀ´Ï´Ù: %s\n" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: Fseek¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "RPM Àбâ(readRPM): %s (Àº)´Â RPM ÆÐÅ°Áö°¡ ¾Æ´Õ´Ï´Ù\n" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "RPM Àбâ(readRPM): %s ¿¡¼ Çì´õ¸¦ Àаí ÀÖ½À´Ï´Ù\n" -#: build/pack.c:475 +#: build/pack.c:467 msgid "Unable to create immutable header region.\n" msgstr "°íÁ¤ Çì´õ ¿µ¿ª(immutable header region)À» »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù.\n" -#: build/pack.c:493 +#: build/pack.c:485 msgid "Unable to write temp header\n" msgstr "ÀÓ½Ã(temp) Çì´õ¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "À߸øµÈ CSA µ¥ÀÌÅÍ\n" -#: build/pack.c:536 +#: build/pack.c:528 msgid "Unable to write final header\n" msgstr "¸¶Áö¸·(final) Çì´õ¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "¼¸í »ý¼º Áß: %d\n" -#: build/pack.c:567 +#: build/pack.c:559 msgid "Unable to reload signature header.\n" msgstr "¼¸í(signature) Çì´õ¸¦ ´Ù½Ã Àоî¿Ã ¼ö ¾ø½À´Ï´Ù.\n" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "%s (À»)¸¦ ¿ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "ÆÐÅ°Áö¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:626 +#: build/pack.c:618 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "¼¸íÇÒ ´ë»ó %s (À»)¸¦ ¿ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:636 +#: build/pack.c:628 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "%s ÀÇ Çì´õ¸¦ ÀÐÀ» ¼ö ¾øÀ½: %s\n" -#: build/pack.c:650 +#: build/pack.c:642 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "%s ¿¡ Çì´õ¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:660 +#: build/pack.c:652 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "%s ÀÇ payload¸¦ ÀÐÀ» ¼ö ¾øÀ½: %s\n" -#: build/pack.c:666 +#: build/pack.c:658 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "%s ¿¡ payload¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "ÀÛ¼º: %s\n" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "%s ÆÐÅ°ÁöÀÇ Ãâ·Â ÆÄÀϸíÀ» »ý¼ºÇÒ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "%s (À»)¸¦ »ý¼ºÇÒ ¼ö ¾øÀ½: %s\n" @@ -1429,7 +1424,7 @@ msgid " failed - " msgstr " ½ÇÆÐÇÔ - " #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -1438,65 +1433,85 @@ msgstr "" "\"B\" ÀÇÁ¸¼ºÀº Áß¿ä½Ã µÇ´Â °Í(epoch)À» ÇÊ¿ä·Î ÇÕ´Ï´Ù (\"A\" ·Î °¡Á¤ÇÕ´Ï´Ù)\n" "\tA %s\tB %s\n" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "¿¹" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "¾Æ´Ï¿À" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, c-format +msgid "cannot open Packages database in %s\n" +msgstr "%s ¾ÈÀÇ ÆÐÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿ ¼ö ¾ø½À´Ï´Ù\n" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, fuzzy, c-format +msgid "package %s already added, ignoring\n" +msgstr "%s ÆÐÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "%s: %-45s ¿¹ (ÆÄÀÏÀÌ Ãß°¡µÊ)\n" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "%s: %-45s ¿¹ (Á¦°øÀÌ Ãß°¡µÊ)\n" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-s (ij½ÃµÊ)\n" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s ¿¹ (rpmrcÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s ¿¹ (rpmlibÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s ¿¹ (db ÆÄÀÏ)\n" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s ¿¹ (db ÆÐÅ°Áö)\n" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s ¾Æ´Ï¿À\n" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) ÀÇÁ¸(Depends) ij½Ã¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù.\n" @@ -1504,43 +1519,43 @@ msgstr "%s: (%s, %s) ÀÇÁ¸(Depends) ij½Ã¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù.\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "%s-%s-%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n" #. conflicts exist. -#: lib/depends.c:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "ÆÐÅ°Áö %s (ÀÌ)°¡ Ãæµ¹ÇÔ: %s\n" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "tsort °ü°è¿¡¼ %s-%s-%s \"%s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== ÆÐÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, ±íÀÌ[depth])\n" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "========== ÈÄÀÓÀÚ [successors only] (Ç¥Çö ¼ø)\n" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "·çÇÁ(LOOP):\n" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n" @@ -2283,70 +2298,70 @@ msgstr "%%%s %s (À»)¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n" msgid "cannot write to %%%s %s\n" msgstr "%%%s %s (À»)¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "¼Ò½º ÆÐÅ°Áö°¡ ¿ä±¸µË´Ï´Ù, ¹ÙÀ̳ʸ®¸¦ ã¾Ò½À´Ï´Ù\n" -#: lib/psm.c:1330 +#: lib/psm.c:1329 msgid "source package contains no .spec file\n" msgstr "¼Ò½º ÆÐÅ°Áö¿¡ .spec ÆÄÀÏÀÌ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: %s ½ºÅ©¸³Æ®¸¦ ½ÇÇàÇÕ´Ï´Ù (ÀÖÀ» °æ¿ì)\n" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" "%2$s-%3$s-%4$s ÀÇ %1$s ½ºÅ©¸³Æ®¸´(scriptlet) ½ÇÇà¿¡ ½ÇÆÐÇß½À´Ï´Ù, waitpid°¡ %" "5$s (À»)¸¦ ¹ÝȯÇÏ¿´½À´Ï´Ù \n" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" "%2$s-%3$s-%4$s ÀÇ %1$s ½ºÅ©¸³Æ®¸´(scriptlet) ½ÇÇà¿¡ ½ÇÆÐÇß½À´Ï´Ù, Á¾·á »óȲ %" "5$d\n" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s (ÀÌ)°¡ %d ÀÇ ÆÄÀÏÀ» °®°í ÀÖ½À´Ï´Ù, Å×½ºÆ® = %d\n" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" "%s: %s ½ºÅ©¸³Æ®¸´(scriptlet)°¡ ½ÇÆÐÇß½À´Ï´Ù (%d), %s-%s-%s (À»)¸¦ »ý·«ÇÕ´Ï" "´Ù\n" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "%s »ç¿ëÀÚ°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "%s ±×·ìÀÌ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¾ÆÄ«À̺긦 Ǫ´Âµ¥ ½ÇÆÐÇÔ%s%s: %s\n" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr " ´ÙÀ½ ÆÄÀÏ¿¡ " -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%2$s ÆÄÀÏÀÇ %1$s (ÀÌ)°¡ ½ÇÆÐÇÔ: %3$s\n" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, c-format msgid "%s failed: %s\n" msgstr "%s (ÀÌ)°¡ ½ÇÆÐÇÔ: %s\n" @@ -2394,8 +2409,8 @@ msgstr "ÆÐÅ°Áö¿¡ ÆÄÀÏ ¼ÒÀ¯ÀÚ ¶Ç´Â id ¸ñ·ÏÀÌ ¾ø½À´Ï´Ù\n" msgid "can't query %s: %s\n" msgstr "%s (À»)¸¦ ÁúÀÇÇÒ ¼ö ¾øÀ½: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "%s (À»)¸¦ ¿©´Âµ¥ ½ÇÆÐÇÔ: %s\n" @@ -2409,7 +2424,7 @@ msgstr "%s (À»)¸¦ ÁúÀÇÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n" msgid "old format source packages cannot be queried\n" msgstr "ÀÌÀü Çü½ÄÀÇ ¼Ò½º ÆÐÅ°Áö´Â ÁúÀÇÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: Àдµ¥ ½ÇÆÐÇß½À´Ï´Ù: %s\n" @@ -2468,7 +2483,7 @@ msgstr "ÆÐÅ°Áö ±â·Ï(record) ¹øÈ£: %u\n" msgid "record %u could not be read\n" msgstr "±â·Ï(record) ¹øÈ£ %u (Àº)´Â ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "%s ÆÐÅ°Áö´Â ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n" @@ -2544,58 +2559,53 @@ msgstr "Áغñ Áß..." msgid "Preparing packages for installation..." msgstr "¼³Ä¡ÇÒ ÆÐÅ°Áö¸¦ ÁغñÇÏ°í ÀÖ½À´Ï´Ù..." -#: lib/rpminstall.c:228 -#, c-format -msgid "cannot open Packages database in %s\n" -msgstr "%s ¾ÈÀÇ ÆÐÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿ ¼ö ¾ø½À´Ï´Ù\n" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "%s (À»)¸¦ º¹±¸ÇÕ´Ï´Ù\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr " ... %s (À¸)·Î\n" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s (À»)¸¦ »ý·«ÇÕ´Ï´Ù - Àü¼Û(transfer)¿¡ ½ÇÆÐÇÔ - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "%s ÆÐÅ°Áö´Â Àç¹èÄ¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "%s ÆÄÀÏÀ» Àд µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "%s ÆÄÀÏÀÌ ÃֽŠ¹öÀüÀÇ RPMÀ» ÇÊ¿ä·Î ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "%s (Àº)´Â ¼³Ä¡µÉ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "%d ÀÇ ¼Ò½º¿Í %d ÀÇ ¹ÙÀ̳ʸ® ÆÐÅ°Áö¸¦ ã¾Ò½À´Ï´Ù\n" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇØ ½ÇÆÐÇÔ:\n" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "¹ÙÀ̳ʸ® ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n" @@ -2604,26 +2614,21 @@ msgstr "¹ÙÀ̳ʸ® ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n" msgid "cannot open file %s: %s\n" msgstr "%s ÆÄÀÏÀ» ¿ ¼ö ¾øÀ½: %s\n" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "%s/packages.rpm À» ¿ ¼ö ¾ø½À´Ï´Ù\n" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¿©·¯°³ÀÇ ÆÐÅ°Áö¸¦ ÁöÁ¤ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "ÀÌ ÆÐÅ°ÁöµéÀ» Á¦°ÅÇϸé ÀÇÁ¸¼ºÀÌ ±úÁú ¼ö ÀÖÀ½:\n" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "%s (À»)¸¦ ¿ ¼ö ¾øÀ½: %s\n" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "%s (À»)¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n" @@ -2879,7 +2884,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "missingok Ç÷¡±×·Î ÀÎÇØ %s (À»)¸¦ »ý·«ÇÕ´Ï´Ù\n" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "%s µð·ºÅ丮¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" @@ -3094,11 +3099,11 @@ msgstr "%3$s (À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" msgid "error(%d) removing record %s from %s\n" msgstr "%3$s ¿¡¼ %2$s ·¹Äڵ带 »èÁ¦ÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" @@ -3107,115 +3112,115 @@ msgstr "" "·Á¸é --rebuilddb ¿É¼ÇÀ» ÀÌ¿ëÇϽʽÿä\n" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, c-format msgid "error(%d) counting packages\n" msgstr "ÆÐÅ°ÁöÀÇ ¼ö¸¦ ¼¼´Â µµÁß ¿À·ù(%d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "µ¥ÀÌÅͺ£À̽ºÀÇ ·¹ÄÚµå ¹øÈ£ %u (ÀÌ)°¡ À߸øµÇ¾ú½À´Ï´Ù -- »ý·«ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "rpmdb: ¼Õ»óµÈ Çì´õ #%u (ÀÌ)°¡ º¹±¸(retrieved)µÇ¾ú½À´Ï´Ù, »ý·«ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: 0x%x ÀÇ Çì´õ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "%2$s À妽º¿¡¼ \"%1$s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing %d entries from %s index.\n" msgstr "%2$s À妽º¿¡¼ %1$d Ç׸ñµé(entries)À» »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "»õ·Î¿î ÆÐÅ°Áö¸¦ ¹èÄ¡ÇÏ´Â µµÁß ¿À·ù(%d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "%2$s À妽º¿¡ \"%1$s\" (À»)¸¦ Ãß°¡ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, c-format msgid "adding %d entries to %s index.\n" msgstr "%2$s À妽º¿¡ %1$d Ç׸ñµé(entries)À» Ãß°¡ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "db3¸¦ À籸Ãà ÇÑ ÈÄ¿¡ %s (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "%2$s ¿¡ µ¥ÀÌÅͺ£À̽º %1$s (À»)¸¦ À籸Ãà ÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "Àӽà µ¥ÀÌÅͺ£À̽º %s (ÀÌ)°¡ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, c-format msgid "creating directory %s\n" msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, c-format msgid "creating directory %s: %s\n" msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÔ: %s\n" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "dbapi %d (À»)¸¦ ÅëÇØ ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "dbapi %d (À»)¸¦ ÅëÇØ »õ·Î¿î µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, c-format msgid "cannot add record originally at %u\n" msgstr "%u ¿¡ ·¹Äڵ带 Ãß°¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "µ¥ÀÌÅͺ£À̽º¸¦ À籸ÃàÇϴµ¥ ½ÇÆÐÇÔ: ¿øº» µ¥ÀÌÅͺ£À̽º´Â ±×´ë·Î À¯ÁöµË´Ï´Ù\n" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ »õ·Î¿î µ¥ÀÌÅͺ£À̽º·Î ±³Ã¼Çϴµ¥ ½ÇÆÐÇß½À´Ï´Ù!\n" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "º¹±¸Çϱâ À§ÇØ $2$s ÀÇ ÆÄÀÏÀ» $1$s ÀÇ ÆÄÀÏ·Î ±³Ã¼ÇÕ´Ï´Ù" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, c-format msgid "removing directory %s\n" msgstr "%s µð·ºÅ丮¸¦ »èÁ¦ÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s µð·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆÐÇÔ: %s\n" @@ -3428,6 +3433,12 @@ msgstr "URL Æ÷Æ®´Â ¹Ýµå½Ã ¼ýÀÚÀ̾î¾ß ÇÕ´Ï´Ù\n" msgid "failed to create %s: %s\n" msgstr "%s (À»)¸¦ »ý¼ºÇϴµ¥ ½ÇÆÐÇÔ: %s\n" +#~ msgid "cannot open rpm database in %s\n" +#~ msgstr "%s ¿¡¼ rpm µ¥ÀÌÅͺ£À̽º¸¦ ¿ ¼ö ¾ø½À´Ï´Ù\n" + +#~ msgid "cannot open %s/packages.rpm\n" +#~ msgstr "%s/packages.rpm À» ¿ ¼ö ¾ø½À´Ï´Ù\n" + #~ msgid "add a signature to a package" #~ msgstr "ÆÐÅ°Áö¿¡ ¼¸íÀ» Ãß°¡ÇÕ´Ï´Ù" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n" "Language-Team: Norwegian <no@li.org>\n" @@ -9,71 +9,66 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:37 -#, c-format -msgid "cannot open rpm database in %s\n" -msgstr "kan ikke åpne database i %s\n" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "feil med avhengigheter under bygging:\n" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "Kunne ikke åpne tar-rør: %m\n" #. Give up -#: build.c:178 +#: build.c:162 #, c-format msgid "Failed to read spec file from %s\n" msgstr "Feil under lesing av spec-fil fra %s\n" -#: build.c:206 +#: build.c:190 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "Feil under endring av navn fra %s til %s: %m\n" -#: build.c:245 +#: build.c:229 #, c-format msgid "failed to stat %s: %m\n" msgstr "kunne ikke kjøre stat på %s: %m\n" -#: build.c:250 +#: build.c:234 #, c-format msgid "File %s is not a regular file.\n" msgstr "Fil %s er ikke en vanlig fil.\n" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "Fil %s ser ikke ut til å være en spec-fil.\n" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "Bygger målplattformene: %s\n" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "Bygger for mål %s\n" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "argumentet er ikke en RPM-pakke\n" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "feil under lesing av header fra pakke\n" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "kan ikke gjenåpne \"payload\": %s\n" @@ -398,44 +393,44 @@ msgstr "" msgid "exec failed\n" msgstr "kjøring feilet\n" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "ingen pakkefiler oppgitt for ombygging" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "ingen spec-fil oppgitt for bygging" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "ingen tar-fil oppgitt for bygging" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "ingen pakker oppgitt for avinstallering" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "ingen pakker oppgitt for installering" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "ingen argumenter oppgitt for spørring" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "ingen argumenter oppgitt for verifisering" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "uventede argumenter til --querytags " -#: rpmqv.c:1156 +#: rpmqv.c:1149 #, fuzzy msgid "no arguments given" msgstr "ingen argumenter oppgitt for spørring" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 msgid "Unable to open temp file.\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" @@ -646,7 +641,7 @@ msgstr "" msgid "Could not open %%files file %s: %s\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "Installerer %s\n" @@ -721,156 +716,156 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:79 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "klarte ikke å åpne %s: %s\n" -#: build/pack.c:84 +#: build/pack.c:82 #, c-format msgid "create archive failed: %s\n" msgstr "feil under oppretting av arkiv %s\n" -#: build/pack.c:106 +#: build/pack.c:104 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "cpio_copy skriving feilet: %s\n" -#: build/pack.c:113 +#: build/pack.c:111 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "cpio_copy: feil under lesing: %s\n" -#: build/pack.c:216 +#: build/pack.c:214 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "Kunne ikke åpne PreIn-fil: %s\n" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "Kunne ikke åpne PreUn-fil: %s\n" -#: build/pack.c:230 +#: build/pack.c:228 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "Kunne ikke åpne PostIn-fil: %s\n" -#: build/pack.c:237 +#: build/pack.c:235 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "Kunne ikke åpne PostUn-fil: %s\n" -#: build/pack.c:245 +#: build/pack.c:243 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "Kunne ikke åpne VerifyScript-fil: %s\n" -#: build/pack.c:260 +#: build/pack.c:258 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: Fseek feilet: %s\n" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s er ikke en RPM-pakke\n" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: leser header fra %s\n" -#: build/pack.c:475 +#: build/pack.c:467 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: build/pack.c:493 +#: build/pack.c:485 #, fuzzy msgid "Unable to write temp header\n" msgstr "Kunne ikke skrive header til %s: %s\n" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "Ugyldige CSA-data\n" -#: build/pack.c:536 +#: build/pack.c:528 #, fuzzy msgid "Unable to write final header\n" msgstr "Kunne ikke skrive header til %s: %s\n" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "Genererer signatur: %d\n" -#: build/pack.c:567 +#: build/pack.c:559 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "Kunne ikke åpne %s: %s\n" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunne ikke skrive pakke: %s\n" -#: build/pack.c:626 +#: build/pack.c:618 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "Kunne ikke åpne sigmål %s: %s\n" -#: build/pack.c:636 +#: build/pack.c:628 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: build/pack.c:650 +#: build/pack.c:642 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "Kunne ikke skrive header til %s: %s\n" -#: build/pack.c:660 +#: build/pack.c:652 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "Kunne ikke lese \"payload\" fra %s: %s\n" -#: build/pack.c:666 +#: build/pack.c:658 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "Kunne ikke skrive \"payload\" til %s: %s\n" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "" @@ -1430,72 +1425,92 @@ msgid " failed - " msgstr " feilet - " #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "JA" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "NEI" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, c-format +msgid "cannot open Packages database in %s\n" +msgstr "kan ikke åpne pakkedatabase i %s\n" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, fuzzy, c-format +msgid "package %s already added, ignoring\n" +msgstr "pakke %s er allerede installert" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1503,42 +1518,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "pakke %s er i konflikt: %s\n" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2268,64 +2283,64 @@ msgstr "kan ikke opprette %%%s %s\n" msgid "cannot write to %%%s %s\n" msgstr "kan ikke skrive til %%%s %s\n" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binær funnet\n" -#: lib/psm.c:1330 +#: lib/psm.c:1329 msgid "source package contains no .spec file\n" msgstr "kildepakke inneholder ikke en .spec-fil\n" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: kjører %s-skript (hvis noen)\n" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr "" -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "klarte ikke å åpne %s: %s\n" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s feilet\n" @@ -2373,8 +2388,8 @@ msgstr "pakken har verken fileier eller id-lister\n" msgid "can't query %s: %s\n" msgstr "kan ikke spørre på %s: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "feil under åpning av %s: %s\n" @@ -2388,7 +2403,7 @@ msgstr "spørring på %s feilet\n" msgid "old format source packages cannot be queried\n" msgstr "kildepakker i gammelt format kan ikke spørres\n" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: lesing av manifest feilet: %s\n" @@ -2447,7 +2462,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "pakke %s er ikke installert\n" @@ -2523,58 +2538,53 @@ msgstr "Forbereder..." msgid "Preparing packages for installation..." msgstr "Forbereder pakker for installasjon..." -#: lib/rpminstall.c:228 -#, c-format -msgid "cannot open Packages database in %s\n" -msgstr "kan ikke åpne pakkedatabase i %s\n" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "Henter %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr " ... som %s\n" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "hopper over %s - overføring feilet - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "pakke %s kan ikke relokeres\n" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "feil under lesing fra fil %s\n" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "fil %s trenger en nyere versjon av RPM\n" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "fant %d kilde- og %d binærpakker\n" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "feilede avhengigheter:\n" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "installerer binærpakker\n" @@ -2583,26 +2593,21 @@ msgstr "installerer binærpakker\n" msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "kan ikke åpne %s/packages.rpm\n" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" spesifiserer flere pakker\n" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "fjerning av disse pakkene vil ødelegge avhengigheter:\n" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "kan ikke åpne %s: %s\n" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" @@ -2857,7 +2862,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer katalog %s\n" @@ -3058,125 +3063,125 @@ msgstr "feil(%d) under lagring av post %s til %s\n" msgid "error(%d) removing record %s from %s\n" msgstr "feil(%d) under fjerning av post %s fra %s\n" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, c-format msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -3388,6 +3393,12 @@ msgstr "url-port må være et tall\n" msgid "failed to create %s: %s\n" msgstr "kunne ikke opprette %s: %s\n" +#~ msgid "cannot open rpm database in %s\n" +#~ msgstr "kan ikke åpne database i %s\n" + +#~ msgid "cannot open %s/packages.rpm\n" +#~ msgstr "kan ikke åpne %s/packages.rpm\n" + #~ msgid "add a signature to a package" #~ msgstr "legg til signatur til en pakke" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n" "Language-Team: Polish <pl@li.org>\n" @@ -16,71 +16,66 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:37 -#, fuzzy, c-format -msgid "cannot open rpm database in %s\n" -msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "niespe³nione zale¿no¶ci:\n" -#: build.c:81 +#: build.c:65 #, fuzzy, c-format msgid "Unable to open spec file %s: %s\n" msgstr "Nie mo¿na otworzyæ pliku spec: %s\n" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, fuzzy, c-format msgid "Failed to open tar pipe: %m\n" msgstr "Otwarcie potoku tara nie powiod³o siê: %s\n" #. Give up -#: build.c:178 +#: build.c:162 #, fuzzy, c-format msgid "Failed to read spec file from %s\n" msgstr "Odczytanie pliku spec z %s nie powiod³o siê\n" -#: build.c:206 +#: build.c:190 #, fuzzy, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "Zmiana nazwy %s na %s nie powiod³a siê\n" -#: build.c:245 +#: build.c:229 #, fuzzy, c-format msgid "failed to stat %s: %m\n" msgstr "stat nie powiod³o siê %s: %s" -#: build.c:250 +#: build.c:234 #, fuzzy, c-format msgid "File %s is not a regular file.\n" msgstr "Plik: %s nie jest regularnym plikiem\n" -#: build.c:259 +#: build.c:243 #, fuzzy, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "%s nie wygl±da na pakiet RPM\n" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "Budowanie dla platform: %s\n" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "Budowanie dla %s\n" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "argument nie jest pakietem RPM\n" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "b³±d odczytu nag³ówka z pakietu\n" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, fuzzy, c-format msgid "cannot re-open payload: %s\n" msgstr "nie mo¿na otworzyæ pliku %s\n" @@ -414,44 +409,44 @@ msgstr "--sign mo¿na u¿yæ tylko w trakcie budowania pakietu" msgid "exec failed\n" msgstr "wykonanie nie powiod³o siê\n" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "nie podano nazw pakietów do przebudowania" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "nie podano nazw plików spec do budowania" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "nie podano nazw plików tar do budowania" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "nie podano nazw plików do usuniêcia" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "nie podano nazw plików do zainstalowania" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "nie podano argumentów dla trybu zapytañ" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "nie podano argumentów dla sprawdzania" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "nieoczekiwane argumenty dla --querytags " -#: rpmqv.c:1156 +#: rpmqv.c:1149 #, fuzzy msgid "no arguments given" msgstr "nie podano argumentów dla trybu zapytañ" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 #, fuzzy msgid "Unable to open temp file.\n" msgstr "Nie mo¿na otworzyæ pliku tymczasowego" @@ -672,7 +667,7 @@ msgstr "Nie znaleziono pliku: %s" msgid "Could not open %%files file %s: %s\n" msgstr "Nie mo¿na otworzyæ %%files pliku: %s" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, fuzzy, c-format msgid "line: %s\n" msgstr "linia: %s" @@ -747,157 +742,157 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "Nie mo¿na rozwi±zaæ nazwy systemu: %s\n" -#: build/pack.c:81 +#: build/pack.c:79 #, fuzzy, c-format msgid "create archive failed on file %s: %s\n" msgstr "utworzenie archiwum pliku %s nie powiod³o siê: %s" -#: build/pack.c:84 +#: build/pack.c:82 #, fuzzy, c-format msgid "create archive failed: %s\n" msgstr "utworzenie archiwum pliku %s nie powiod³o siê: %s" -#: build/pack.c:106 +#: build/pack.c:104 #, fuzzy, c-format msgid "cpio_copy write failed: %s\n" msgstr "zapis w trybie cpio_copy nie powiód³ siê: %s" -#: build/pack.c:113 +#: build/pack.c:111 #, fuzzy, c-format msgid "cpio_copy read failed: %s\n" msgstr "odczyt w trybie cpio_copy nie powiód³ siê: %s" -#: build/pack.c:216 +#: build/pack.c:214 #, fuzzy, c-format msgid "Could not open PreIn file: %s\n" msgstr "Nie mo¿na otworzyæ pliku PreIn: %s" -#: build/pack.c:223 +#: build/pack.c:221 #, fuzzy, c-format msgid "Could not open PreUn file: %s\n" msgstr "Nie mo¿na otworzyæ pliku PreUn: %s" -#: build/pack.c:230 +#: build/pack.c:228 #, fuzzy, c-format msgid "Could not open PostIn file: %s\n" msgstr "Nie mo¿na otworzyæ pliku PostIn: %s" -#: build/pack.c:237 +#: build/pack.c:235 #, fuzzy, c-format msgid "Could not open PostUn file: %s\n" msgstr "Nie mo¿na otworzyæ pliku PostUn: %s" -#: build/pack.c:245 +#: build/pack.c:243 #, fuzzy, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "Nie mo¿na otworzyæ pliku VerifyScript: %s" -#: build/pack.c:260 +#: build/pack.c:258 #, fuzzy, c-format msgid "Could not open Trigger script file: %s\n" msgstr "Nie mo¿na otworzyæ skryptu Trigger: %s" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "readRPM: otwieranie %s: %s\n" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "readRPM: czytanie %s: %s\n" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, fuzzy, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: readLead nie powiod³o siê\n" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s nie jest pakietem RPM\n" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: czytanie nag³ówka z %s\n" -#: build/pack.c:475 +#: build/pack.c:467 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "Nie mo¿na odczytaæ ikony: %s" -#: build/pack.c:493 +#: build/pack.c:485 #, fuzzy msgid "Unable to write temp header\n" msgstr "Nie mo¿na zapisaæ %s" -#: build/pack.c:501 +#: build/pack.c:493 #, fuzzy msgid "Bad CSA data\n" msgstr "B³êdne dane CSA" -#: build/pack.c:536 +#: build/pack.c:528 #, fuzzy msgid "Unable to write final header\n" msgstr "Nie mo¿na zapisaæ %s" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "Generowanie sygnatury: %d\n" -#: build/pack.c:567 +#: build/pack.c:559 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "Nie mo¿na odczytaæ ikony: %s" -#: build/pack.c:575 +#: build/pack.c:567 #, fuzzy, c-format msgid "Could not open %s: %s\n" msgstr "Nie mo¿na otworzyæ %s\n" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nie mo¿na zapisaæ pakietu: %s" -#: build/pack.c:626 +#: build/pack.c:618 #, fuzzy, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "Nie mo¿na odczytaæ sigtarget: %s" -#: build/pack.c:636 +#: build/pack.c:628 #, fuzzy, c-format msgid "Unable to read header from %s: %s\n" msgstr "Nie mo¿na odczytaæ ikony: %s" -#: build/pack.c:650 +#: build/pack.c:642 #, fuzzy, c-format msgid "Unable to write header to %s: %s\n" msgstr "Nie mo¿na zapisaæ pakietu: %s" -#: build/pack.c:660 +#: build/pack.c:652 #, fuzzy, c-format msgid "Unable to read payload from %s: %s\n" msgstr "Nie mo¿na odczytaæ ikony: %s" -#: build/pack.c:666 +#: build/pack.c:658 #, fuzzy, c-format msgid "Unable to write payload to %s: %s\n" msgstr "Nie mo¿na zapisaæ pakietu: %s" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "Nie mo¿na wygenerowaæ wyj¶ciowej nazwy dla pakietu %s: %s\n" -#: build/pack.c:775 +#: build/pack.c:767 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "nie mo¿na utworzyæ %s" @@ -1471,73 +1466,93 @@ msgid " failed - " msgstr " nie powiod³o siê -" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 #, fuzzy msgid "NO " msgstr "NIE DOBRZE" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, fuzzy, c-format +msgid "cannot open Packages database in %s\n" +msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, fuzzy, c-format +msgid "package %s already added, ignoring\n" +msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" @@ -1545,42 +1560,42 @@ msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, 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:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "pakiet %s jest w konflikcie: %s\n" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "usuwanie indeksu grupy\n" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2350,66 +2365,66 @@ msgstr "nie mo¿na utworzyæ %s" msgid "cannot write to %%%s %s\n" msgstr "nie mo¿na zapisaæ do %s" -#: lib/psm.c:1217 +#: lib/psm.c:1216 #, fuzzy msgid "source package expected, binary found\n" msgstr "spodziewany pakiet ¼ród³owy a nie binarny" -#: lib/psm.c:1330 +#: lib/psm.c:1329 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pakiet ¼ród³owy nie zawiera pliku .spec" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "wykonanie skryptu nie powiod³o siê" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "wykonanie skryptu nie powiod³o siê" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "pakiet: %s-%s-%s test plików = %d\n" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "u¿ytkownik %s nie istnieje - u¿yto konta root" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s nie istnieje - u¿yto grupy root" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozpakowanie archiwum nie powiod³o siê %s%s: %s" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr " na pliku " -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nie mo¿na otworzyæ %s: %s" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s nie powiod³o siê" @@ -2458,8 +2473,8 @@ msgstr "pakiet nie ma ani w³a¶ciciela pliku ani list id" msgid "can't query %s: %s\n" msgstr "nie mo¿na odwi±zaæ %s: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "otwarcie %s nie powiod³o siê\n" @@ -2473,7 +2488,7 @@ msgstr "odpytywanie %s nie powiod³o siê\n" msgid "old format source packages cannot be queried\n" msgstr "pakiety w starym formacie nie mog± byæ odpytywane\n" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: readLead nie powiod³o siê\n" @@ -2533,7 +2548,7 @@ msgstr "numer rekordu pakietu: %d\n" msgid "record %u could not be read\n" msgstr "nie mo¿na odczytaæ rekordu %d\n" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "pakiet %s nie jest zainstalowany\n" @@ -2611,58 +2626,53 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "nie podano nazw plików do zainstalowania" -#: lib/rpminstall.c:228 -#, fuzzy, c-format -msgid "cannot open Packages database in %s\n" -msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "¦ci±ganie %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "... jako %s\n" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s pomijany - transmisja %s nie powiod³a siê\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "pakiet %s nie jest przesuwalny\n" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "b³±d czytania z pliku %s\n" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "plik %s wymaga nowszej wersji RPM\n" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie mo¿e byæ zainstalowany\n" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "znaleziono %d pakietów ¼ród³owych i %d binarnych\n" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "niespe³nione zale¿no¶ci:\n" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "instalacja pakietów binarnych\n" @@ -2671,26 +2681,21 @@ msgstr "instalacja pakietów binarnych\n" msgid "cannot open file %s: %s\n" msgstr "nie mo¿na otworzyæ pliku %s: %s" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" okre¶la wiele pakietów\n" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "usuniêcie tych pakietów zerwie zale¿no¶ci:\n" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie mo¿na otworzyæ %s\n" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "Instalacja %s\n" @@ -2956,7 +2961,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "%s pominiêty z powodu flagi missingok\n" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "tworzenie katalogu: %s\n" @@ -3165,12 +3170,12 @@ msgstr "b³±d zapisywania rekordu %s do %s" msgid "error(%d) removing record %s from %s\n" msgstr "b³±d usuwania rekordu %s z %s" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 #, fuzzy msgid "no dbpath has been set\n" msgstr "¶cie¿ka bazy danych nie zosta³a podana" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 #, fuzzy msgid "" "old format database is present; use --rebuilddb to generate a new format " @@ -3180,115 +3185,115 @@ msgstr "" "nowym formacie" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, fuzzy, c-format msgid "error(%d) counting packages\n" msgstr "b³±d szukania pakietu %s\n" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "rekord numer %d w bazie danych jest b³êdny -- rekord pominiêto" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "nie mo¿na odczytaæ nag³ówka przy %d dla poszukiwania" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "usuwanie indeksu grupy\n" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "usuwanie indeksu nazw\n" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "b³±d szukania pakietu %s\n" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "zmiana nazwy %s na %s\n" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "zmiana nazwy %s na %s\n" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "¶cie¿ka bazy danych nie zosta³a podana" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "odbudowywujê bazê danych w rootdir %s\n" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "tymczasowa baza danych %s ju¿ istnieje" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "otwieranie starej bazy danych\n" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "otwieranie nowej bazy danych\n" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "nie mo¿na dodaæ rekordu oryginalnie przy %d" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "przebudowanie bazy nie powiod³o siê; stara pozosta³a na miejscu\n" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "zamiana starej bazy na now± nie powiod³a siê!\n" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "naprawcze zastêpowanie plików w %s plikami z %s" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n" @@ -3504,6 +3509,13 @@ msgstr "port musi byæ liczb±\n" msgid "failed to create %s: %s\n" msgstr "utworzenie %s nie powiod³o siê\n" +#, fuzzy +#~ msgid "cannot open rpm database in %s\n" +#~ msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" + +#~ msgid "cannot open %s/packages.rpm\n" +#~ msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" + #~ msgid "add a signature to a package" #~ msgstr "dodaj sygnaturê do pakietu" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: 2000-06-22 01:13+01:00\n" "Last-Translator: José Nuno Coelho Sanarra Pires\n" "Language-Team: pt <kde@poli.org>\n" @@ -9,71 +9,66 @@ msgstr "" "Content-Type: text/plain; charset=iso-latin1\n" "Content-Transfer-Encoding: none\n" -#: build.c:37 -#, c-format -msgid "cannot open rpm database in %s\n" -msgstr "não consigo a base de dados do RPM em %s\n" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "não consegui construir dependências:\n" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "Não consegui abrir ficheiro spec %s: %s\n" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "Não consegui abrir o 'pipe' para o tar: %m\n" #. Give up -#: build.c:178 +#: build.c:162 #, c-format msgid "Failed to read spec file from %s\n" msgstr "Não consegui ler o ficheiro spec do %s\n" -#: build.c:206 +#: build.c:190 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "Não consegui mudar o nome de %s para %s: %m\n" -#: build.c:245 +#: build.c:229 #, c-format msgid "failed to stat %s: %m\n" msgstr "Não consegui analisar o %s: %m\n" -#: build.c:250 +#: build.c:234 #, c-format msgid "File %s is not a regular file.\n" msgstr "O ficheiro %s não é um ficheiro normal.\n" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "O ficheiro %s não parece ser um ficheiro spec.\n" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "A construir plataformas alvo: %s\n" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "A construir para o alvo %s\n" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "o argumento não é um pacote RPM\n" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "erro ao ler o cabeçalho do pacote\n" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "não consigo aceder de novo ao conteúdo: %s\n" @@ -394,44 +389,44 @@ msgstr "o --sign só pode ser usado na criação do pacote" msgid "exec failed\n" msgstr "o exec falhou\n" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "não foram indicados pacotes para a reconstrução" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "não foram indicados ficheiros spec para a criação" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "não foram indicados ficheiros tar para a criação" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "não foram indicados pacote para desinstalar" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "não foram indicados pacotes para instalar" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "não foram indicados argumentos para a pesquisa" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "não foram indicados argumentos para a verificação" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "argumentos inesperados no --querytags " -#: rpmqv.c:1156 +#: rpmqv.c:1149 #, fuzzy msgid "no arguments given" msgstr "não foram indicados argumentos para a pesquisa" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 msgid "Unable to open temp file.\n" msgstr "Não consegui abrir um ficheiro temporário.\n" @@ -642,7 +637,7 @@ msgstr "Ficheiro não encontrado pelo glob: %s\n" msgid "Could not open %%files file %s: %s\n" msgstr "Não consegui abrir o ficheiro do %%files %s: %s\n" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "linha: %s\n" @@ -719,156 +714,156 @@ msgstr "getGnameS: demasiados gid's\n" msgid "Could not canonicalize hostname: %s\n" msgstr "Não consegui canonizar o nome da máquina: %s\n" -#: build/pack.c:81 +#: build/pack.c:79 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "a criação do pacote falhou no ficheiro %s: %s\n" -#: build/pack.c:84 +#: build/pack.c:82 #, fuzzy, c-format msgid "create archive failed: %s\n" msgstr "a criação do pacote falhou no ficheiro %s: %s\n" -#: build/pack.c:106 +#: build/pack.c:104 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "a escrita do cpio_copy falhou: %s\n" -#: build/pack.c:113 +#: build/pack.c:111 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "a leitura do cpio_copy falhou: %s\n" -#: build/pack.c:216 +#: build/pack.c:214 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "Não consegui abrir o ficheiro PreIn: %s\n" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "Não consegui abrir o ficheiro PreUn: %s\n" -#: build/pack.c:230 +#: build/pack.c:228 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "Não consegui abrir o ficheiro PostIn: %s\n" -#: build/pack.c:237 +#: build/pack.c:235 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "Não consegui abrir o ficheiro PostUn: %s\n" -#: build/pack.c:245 +#: build/pack.c:243 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "Não consegui abrir o ficheiro VerifyScript: %s\n" -#: build/pack.c:260 +#: build/pack.c:258 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "Não consegui aceder ao 'script' Trigger: %s\n" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "readRPM: aceder ao %s: %s\n" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "readRPM: ler o %s: %s\n" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, fuzzy, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: O fread falhou: %s\n" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: o %s não é um pacote RPM\n" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: a ler o cabeçalho do %s\n" -#: build/pack.c:475 +#: build/pack.c:467 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "Não consegui ler o cabeçalho de %s: %s\n" -#: build/pack.c:493 +#: build/pack.c:485 #, fuzzy msgid "Unable to write temp header\n" msgstr "Não consegui gravar o cabeçalho de %s: %s\n" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "Dados de CSA inválidos\n" -#: build/pack.c:536 +#: build/pack.c:528 #, fuzzy msgid "Unable to write final header\n" msgstr "Não consegui gravar o cabeçalho de %s: %s\n" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "A gerar a assinatura: %d\n" -#: build/pack.c:567 +#: build/pack.c:559 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "Não consegui ler o cabeçalho de %s: %s\n" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "Não consigo aceder ao %s: %s\n" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "Não consegui gravar o pacote: %s\n" -#: build/pack.c:626 +#: build/pack.c:618 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "Não consegui abrir o sigtarget %s: %s\n" -#: build/pack.c:636 +#: build/pack.c:628 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "Não consegui ler o cabeçalho de %s: %s\n" -#: build/pack.c:650 +#: build/pack.c:642 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "Não consegui gravar o cabeçalho de %s: %s\n" -#: build/pack.c:660 +#: build/pack.c:652 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "Não consegui ler o conteúdo de %s: %s\n" -#: build/pack.c:666 +#: build/pack.c:658 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "Não consegui escrever o conteúdo de %s: %s\n" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "Gravei: %s\n" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "Não consigo gerar o ficheiro de saída para o pacote %s: %s\n" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "não consigo criar o %s: %s\n" @@ -1426,7 +1421,7 @@ msgid " failed - " msgstr " falhou - " #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -1435,66 +1430,86 @@ msgstr "" "A dependência \"B\" precisa duma época (assumindo a mesma que \"A\")\n" "\t %s\tB %s\n" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 #, fuzzy msgid "NO " msgstr "NÃO-OK" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, c-format +msgid "cannot open Packages database in %s\n" +msgstr "não consigo abrir a base de dados Packages em %s\n" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, fuzzy, c-format +msgid "package %s already added, ignoring\n" +msgstr "o pacote %s já está instalado" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "%s: %-45s SIM (ficheiros adicionados)\n" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "%s: %-45s SIM (oferecidos para adição)\n" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-3s (em cache)\n" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s SIM (oferecidos pelo rpmrc)\n" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s SIM (oferecidos pela rpmlib)\n" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s SIM (ficheiros db)\n" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s SI (oferecidos pelo db)\n" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s SIM (pacote db)\n" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NÃO\n" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) adicionado à cache de dependências.\n" @@ -1502,42 +1517,42 @@ msgstr "%s: (%s, %s) adicionado à cache de dependências.\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, 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:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "o pacote %s está em conflito: %s\n" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%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:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "=========== a guardar as relações do tsort\n" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "========== só os sucessores (ordem de apresentação)\n" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "CICLO:\n" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "========== a prosseguir o tsort ...\n" @@ -2280,64 +2295,64 @@ msgstr "não consigo criar o %s: %s\n" msgid "cannot write to %%%s %s\n" msgstr "não consigo escrever em %s\n" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "esperava-se um pacote com código-fonte, foi encontrado um pacote binário\n" -#: lib/psm.c:1330 +#: lib/psm.c:1329 msgid "source package contains no .spec file\n" msgstr "o pacote de código-fonte não contem um ficheiro .spec\n" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "a correr os programas de pós-instalação (se existirem)\n" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "a execução do 'scriptlet' %s do %s-%s-%s falhou com código de erro %d\n" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "a execução do 'scriptlet' %s do %s-%s-%s falhou com código de erro %d\n" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "pacote: teste dos ficheiros do %s-%s-%s = %d\n" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "o utilizador %s não existe - a usar o root\n" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "o grupo %s não existe - a usar o root\n" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "a abertura do pacote falhou%s%s: %s\n" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr " no ficheiro " -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "falhei ao aceder ao %s: %s\n" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "O %s falhou\n" @@ -2385,8 +2400,8 @@ msgstr "o pacote nem tem um dono do ficheiro ou as listas de IDs\n" msgid "can't query %s: %s\n" msgstr "não consigo pesquisar o %s: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "o acesso ao %s falhou: %s\n" @@ -2400,7 +2415,7 @@ msgstr "a pesquisa do %s falhou\n" msgid "old format source packages cannot be queried\n" msgstr "os pacotes com código-fonte no formato antigo não podem ser pesquisados\n" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: O fread falhou: %s\n" @@ -2459,7 +2474,7 @@ msgstr "número de registo do pacote: %u\n" msgid "record %u could not be read\n" msgstr "o registo %d não pôde ser lido\n" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "o pacote %s não está instalado\n" @@ -2535,58 +2550,53 @@ msgstr "A preparar..." msgid "Preparing packages for installation..." msgstr "A preparar os pacotes para a instalação..." -#: lib/rpminstall.c:228 -#, c-format -msgid "cannot open Packages database in %s\n" -msgstr "não consigo abrir a base de dados Packages em %s\n" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "A obter o %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr " ... como %s\n" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "a ignorar o %s - a transferência falhou - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "o pacote %s não pode ser mudado de sítio\n" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "erro ao ler do ficheiros %s\n" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "o %s precisa duma versão mais recente do RPM\n" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "o %s não pode ser instalado\n" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "encontrados %d pacotes com código-fonte e %d binários\n" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "dependências falhadas:\n" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "a instalar os pacotes binários\n" @@ -2595,26 +2605,21 @@ msgstr "a instalar os pacotes binários\n" msgid "cannot open file %s: %s\n" msgstr "não consigo aceder ao ficheiro %s: %s\n" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "não consigo abrir %s/packages.rpm\n" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "o \"%s\" especifica vários pacotes\n" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "a remoção destes pacotes irá quebrar dependências:\n" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "não consigo aceder ao %s: %s\n" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "A instalar o %s\n" @@ -2870,7 +2875,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "%s ignorado devido à opção missingok\n" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "a excluir a directoria %s\n" @@ -3077,125 +3082,125 @@ msgstr "erro(%d) ao guardar o registo %s em %s\n" msgid "error(%d) removing record %s from %s\n" msgstr "erro(%d) ao remover o registo %s do %s\n" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "não foi definido o dbpath\n" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "está presente uma base de dados antiga; use o --rebuildb para gerar uma base de dados no novo formato\n" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, c-format msgid "error(%d) counting packages\n" msgstr "erro(%d) ao contar os pacotes\n" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "o número do registo %d na base de dados está errado -- a ignorar.\n" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: não consigo ler o cabeçalho em 0x%x\n" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "a remover o \"%s\" do índice %s.\n" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing %d entries from %s index.\n" msgstr "a remover %d registos do índice %s.\n" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "erro(%d) ao criar uma nova instância do pacote\n" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "a adicionar o \"%s\" ao índice %s.\n" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, c-format msgid "adding %d entries to %s index.\n" msgstr "a adicionar %d registos ao índice %s.\n" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "a remover o %s depois duma reconstrução bem sucedida do db3.\n" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "não foi definido o dbpath" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "a reconstruir a base de dados %s em %s\n" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "A base de dados temporária %s já existe\n" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, c-format msgid "creating directory %s\n" msgstr "a criar a directoria %s\n" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, c-format msgid "creating directory %s: %s\n" msgstr "a criar a directoria %s: %s\n" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "a abrir a base de dados antiga com a dbapi %d\n" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "a abrir a base de dados nova com a dbapi %d\n" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "não consigo adicionar o registo originalmente em %d\n" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "falhou a reconstrução da base de dados: a base de dados original mantém-se\n" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "falhou a substituição da base de dados antiga pela nova!\n" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "substituir os ficheiros em %s por ficheiros de %s a recuperar" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, c-format msgid "removing directory %s\n" msgstr "a remover a directoria %s\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "falhou a remoção da directoria %s: %s\n" @@ -3407,6 +3412,12 @@ msgstr "o porto do URL tem de ser um número\n" msgid "failed to create %s: %s\n" msgstr "não consegui criar o %s: %s\n" +#~ msgid "cannot open rpm database in %s\n" +#~ msgstr "não consigo a base de dados do RPM em %s\n" + +#~ msgid "cannot open %s/packages.rpm\n" +#~ msgstr "não consigo abrir %s/packages.rpm\n" + #~ msgid "add a signature to a package" #~ msgstr "adicionar uma assinatura a um pacote" diff --git a/po/pt_BR.po b/po/pt_BR.po index 16d723121..db4638c92 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,81 +4,75 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" -# , c-format -#: build.c:37 -#, fuzzy, c-format -msgid "cannot open rpm database in %s\n" -msgstr "No consegui abrir: %s\n" - -#: build.c:48 +#: build.c:36 #, fuzzy msgid "failed build dependencies:\n" msgstr "lista dependncias do pacote" # , c-format -#: build.c:81 +#: build.c:65 #, fuzzy, c-format msgid "Unable to open spec file %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, fuzzy, c-format msgid "Failed to open tar pipe: %m\n" msgstr "No consegui abrir: %s\n" # , c-format #. Give up -#: build.c:178 +#: build.c:162 #, fuzzy, c-format msgid "Failed to read spec file from %s\n" msgstr "No consegui ler o arquivo spec de %s\n" # , c-format -#: build.c:206 +#: build.c:190 #, fuzzy, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "No consegui ler o arquivo spec de %s\n" # , c-format -#: build.c:245 +#: build.c:229 #, fuzzy, c-format msgid "failed to stat %s: %m\n" msgstr "No consegui abrir: %s\n" -#: build.c:250 +#: build.c:234 #, fuzzy, c-format msgid "File %s is not a regular file.\n" msgstr "no foi passado pacote para instalao" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:329 +#: build.c:316 #, fuzzy, c-format msgid "Building for target %s\n" msgstr "instale pacote" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "" # , c-format -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, fuzzy, c-format msgid "cannot re-open payload: %s\n" msgstr "No consegui abrir: %s\n" @@ -443,45 +437,45 @@ msgstr "--sign somente pode ser usado durante a construo de pacotes" msgid "exec failed\n" msgstr "Construo falhou.\n" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "no foram passados pacotes para reconstruo" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "no foi passado arquivo spec para construo" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "no foram passados arquivos tar para construo" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "no foi passado pacote para desinstalao" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "no foi passado pacote para instalao" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "no foi passado argumento para pesquisa" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "no foi passado argumento para verificao" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "argumentos no esperados em --querytags" -#: rpmqv.c:1156 +#: rpmqv.c:1149 #, fuzzy msgid "no arguments given" msgstr "no foi passado argumento para pesquisa" # , c-format -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 #, fuzzy msgid "Unable to open temp file.\n" msgstr "No consegui abrir: %s\n" @@ -709,7 +703,7 @@ msgid "Could not open %%files file %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, fuzzy, c-format msgid "line: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" @@ -790,180 +784,180 @@ msgid "Could not canonicalize hostname: %s\n" msgstr "" # , c-format -#: build/pack.c:81 +#: build/pack.c:79 #, fuzzy, c-format msgid "create archive failed on file %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:84 +#: build/pack.c:82 #, fuzzy, c-format msgid "create archive failed: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:106 +#: build/pack.c:104 #, fuzzy, c-format msgid "cpio_copy write failed: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:113 +#: build/pack.c:111 #, fuzzy, c-format msgid "cpio_copy read failed: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:216 +#: build/pack.c:214 #, fuzzy, c-format msgid "Could not open PreIn file: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:223 +#: build/pack.c:221 #, fuzzy, c-format msgid "Could not open PreUn file: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:230 +#: build/pack.c:228 #, fuzzy, c-format msgid "Could not open PostIn file: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:237 +#: build/pack.c:235 #, fuzzy, c-format msgid "Could not open PostUn file: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:245 +#: build/pack.c:243 #, fuzzy, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:260 +#: build/pack.c:258 #, fuzzy, c-format msgid "Could not open Trigger script file: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:288 +#: build/pack.c:286 #, fuzzy, c-format msgid "readRPM: open %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:298 +#: build/pack.c:296 #, fuzzy, c-format msgid "readRPM: read %s: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" # , c-format -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, fuzzy, c-format msgid "%s: Fseek failed: %s\n" msgstr "No consegui abrir: %s\n" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" # , c-format -#: build/pack.c:475 +#: build/pack.c:467 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:493 +#: build/pack.c:485 #, fuzzy msgid "Unable to write temp header\n" msgstr "No consegui abrir: %s\n" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "" # , c-format -#: build/pack.c:536 +#: build/pack.c:528 #, fuzzy msgid "Unable to write final header\n" msgstr "No consegui abrir: %s\n" -#: build/pack.c:554 +#: build/pack.c:546 #, fuzzy, c-format msgid "Generating signature: %d\n" msgstr "gere assinatura PGP" # , c-format -#: build/pack.c:567 +#: build/pack.c:559 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:575 +#: build/pack.c:567 #, fuzzy, c-format msgid "Could not open %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:626 +#: build/pack.c:618 #, fuzzy, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:636 +#: build/pack.c:628 #, fuzzy, c-format msgid "Unable to read header from %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:650 +#: build/pack.c:642 #, fuzzy, c-format msgid "Unable to write header to %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:660 +#: build/pack.c:652 #, fuzzy, c-format msgid "Unable to read payload from %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:666 +#: build/pack.c:658 #, fuzzy, c-format msgid "Unable to write payload to %s: %s\n" msgstr "No consegui abrir: %s\n" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" # , c-format -#: build/pack.c:775 +#: build/pack.c:767 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "No consegui abrir: %s\n" @@ -1584,72 +1578,93 @@ msgid " failed - " msgstr "Construo falhou.\n" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "" -#: lib/depends.c:1044 +# , c-format +#: lib/depends.c:815 +#, fuzzy, c-format +msgid "cannot open Packages database in %s\n" +msgstr "No consegui abrir: %s\n" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, fuzzy, c-format +msgid "package %s already added, ignoring\n" +msgstr "no foi passado pacote para instalao" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1657,42 +1672,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, 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:1535 +#: lib/depends.c:1747 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "no foi passado pacote para desinstalao" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2502,66 +2517,66 @@ msgstr "No consegui abrir: %s\n" msgid "cannot write to %%%s %s\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1329 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pesquise o pacote ao qual <arquivo> pertence" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "no execute nenhum estgio" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "no foi passado pacote para instalao" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "Construo falhou.\n" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "Construo falhou.\n" @@ -2612,8 +2627,8 @@ msgstr "no foi passado pacote para instalao" msgid "can't query %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "Construo falhou.\n" @@ -2628,7 +2643,7 @@ msgid "old format source packages cannot be queried\n" msgstr "" # , c-format -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "No consegui abrir: %s\n" @@ -2688,7 +2703,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "no foi passado pacote para instalao" @@ -2769,12 +2784,6 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "no foi passado pacote para instalao" -# , c-format -#: lib/rpminstall.c:228 -#, fuzzy, c-format -msgid "cannot open Packages database in %s\n" -msgstr "No consegui abrir: %s\n" - # "Project-Id-Version: rpm-2.5.3\n" # "PO-Revision-Date: 1997-09-11 14:00 MET DST\n" # "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n" @@ -2783,54 +2792,54 @@ msgstr "No consegui abrir: %s\n" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, fuzzy, c-format msgid "Retrieving %s\n" msgstr "RPM verso %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "no foi passado pacote para instalao" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "no foi passado pacote para instalao" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 #, fuzzy msgid "failed dependencies:\n" msgstr "lista dependncias do pacote" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 #, fuzzy msgid "installing binary packages\n" msgstr "instale pacote" @@ -2841,28 +2850,23 @@ msgstr "instale pacote" msgid "cannot open file %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 #, fuzzy msgid "removing these packages would break dependencies:\n" msgstr "lista dependncias do pacote" # , c-format -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "" @@ -3145,7 +3149,7 @@ msgstr "" # "Content-Transfer-Encoding: 8-bit\n" # , c-format #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "RPM verso %s\n" @@ -3354,119 +3358,119 @@ msgstr "No consegui abrir: %s\n" msgid "error(%d) removing record %s from %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, fuzzy, c-format msgid "error(%d) counting packages\n" msgstr "no foi passado pacote para instalao" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "no foi passado pacote para desinstalao" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "no foi passado pacote para instalao" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" @@ -3479,13 +3483,13 @@ msgstr "" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "RPM verso %s\n" # , c-format -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "No consegui abrir: %s\n" @@ -3700,6 +3704,11 @@ msgstr "" msgid "failed to create %s: %s\n" msgstr "No consegui abrir o pipe tar: %s\n" +# , c-format +#, fuzzy +#~ msgid "cannot open rpm database in %s\n" +#~ msgstr "No consegui abrir: %s\n" + #~ msgid "add a signature to a package" #~ msgstr "adicione uma assinatura a um pacote" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton <gafton@redhat.com>\n" "Language-Team: Romanian <ro@li.org>\n" @@ -9,71 +9,66 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:37 -#, c-format -msgid "cannot open rpm database in %s\n" -msgstr "" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "" #. Give up -#: build.c:178 +#: build.c:162 #, c-format msgid "Failed to read spec file from %s\n" msgstr "" -#: build.c:206 +#: build.c:190 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "" -#: build.c:245 +#: build.c:229 #, c-format msgid "failed to stat %s: %m\n" msgstr "" -#: build.c:250 +#: build.c:234 #, c-format msgid "File %s is not a regular file.\n" msgstr "" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "" @@ -392,43 +387,43 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1156 +#: rpmqv.c:1149 msgid "no arguments given" msgstr "" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 msgid "Unable to open temp file.\n" msgstr "" @@ -636,7 +631,7 @@ msgstr "" msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" @@ -711,152 +706,152 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:79 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "" -#: build/pack.c:84 +#: build/pack.c:82 #, c-format msgid "create archive failed: %s\n" msgstr "" -#: build/pack.c:106 +#: build/pack.c:104 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "" -#: build/pack.c:113 +#: build/pack.c:111 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "" -#: build/pack.c:216 +#: build/pack.c:214 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "" -#: build/pack.c:230 +#: build/pack.c:228 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "" -#: build/pack.c:237 +#: build/pack.c:235 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "" -#: build/pack.c:245 +#: build/pack.c:243 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "" -#: build/pack.c:260 +#: build/pack.c:258 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:475 +#: build/pack.c:467 msgid "Unable to create immutable header region.\n" msgstr "" -#: build/pack.c:493 +#: build/pack.c:485 msgid "Unable to write temp header\n" msgstr "" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:536 +#: build/pack.c:528 msgid "Unable to write final header\n" msgstr "" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "" -#: build/pack.c:567 +#: build/pack.c:559 msgid "Unable to reload signature header.\n" msgstr "" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" -#: build/pack.c:626 +#: build/pack.c:618 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "" -#: build/pack.c:636 +#: build/pack.c:628 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "" -#: build/pack.c:650 +#: build/pack.c:642 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "" -#: build/pack.c:660 +#: build/pack.c:652 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "" -#: build/pack.c:666 +#: build/pack.c:658 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "" @@ -1411,72 +1406,92 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, c-format +msgid "cannot open Packages database in %s\n" +msgstr "" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, c-format +msgid "package %s already added, ignoring\n" +msgstr "" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1484,42 +1499,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2236,64 +2251,64 @@ msgstr "" msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1329 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr "" -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2341,8 +2356,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2356,7 +2371,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2415,7 +2430,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2491,58 +2506,53 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:228 -#, c-format -msgid "cannot open Packages database in %s\n" -msgstr "" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "" @@ -2551,26 +2561,21 @@ msgstr "" msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "" @@ -2823,7 +2828,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3024,125 +3029,125 @@ msgstr "" msgid "error(%d) removing record %s from %s\n" msgstr "" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, c-format msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index d56aaa22e..5ebf63dab 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-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -14,71 +14,66 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: build.c:37 -#, c-format -msgid "cannot open rpm database in %s\n" -msgstr "" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "" #. Give up -#: build.c:178 +#: build.c:162 #, c-format msgid "Failed to read spec file from %s\n" msgstr "" -#: build.c:206 +#: build.c:190 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "" -#: build.c:245 +#: build.c:229 #, c-format msgid "failed to stat %s: %m\n" msgstr "" -#: build.c:250 +#: build.c:234 #, c-format msgid "File %s is not a regular file.\n" msgstr "" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "" @@ -397,43 +392,43 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1156 +#: rpmqv.c:1149 msgid "no arguments given" msgstr "" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 msgid "Unable to open temp file.\n" msgstr "" @@ -641,7 +636,7 @@ msgstr "" msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" @@ -716,152 +711,152 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:79 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "" -#: build/pack.c:84 +#: build/pack.c:82 #, c-format msgid "create archive failed: %s\n" msgstr "" -#: build/pack.c:106 +#: build/pack.c:104 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "" -#: build/pack.c:113 +#: build/pack.c:111 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "" -#: build/pack.c:216 +#: build/pack.c:214 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "" -#: build/pack.c:230 +#: build/pack.c:228 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "" -#: build/pack.c:237 +#: build/pack.c:235 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "" -#: build/pack.c:245 +#: build/pack.c:243 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "" -#: build/pack.c:260 +#: build/pack.c:258 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:475 +#: build/pack.c:467 msgid "Unable to create immutable header region.\n" msgstr "" -#: build/pack.c:493 +#: build/pack.c:485 msgid "Unable to write temp header\n" msgstr "" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:536 +#: build/pack.c:528 msgid "Unable to write final header\n" msgstr "" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "" -#: build/pack.c:567 +#: build/pack.c:559 msgid "Unable to reload signature header.\n" msgstr "" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" -#: build/pack.c:626 +#: build/pack.c:618 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "" -#: build/pack.c:636 +#: build/pack.c:628 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "" -#: build/pack.c:650 +#: build/pack.c:642 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "" -#: build/pack.c:660 +#: build/pack.c:652 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "" -#: build/pack.c:666 +#: build/pack.c:658 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "" @@ -1416,72 +1411,92 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, c-format +msgid "cannot open Packages database in %s\n" +msgstr "" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, c-format +msgid "package %s already added, ignoring\n" +msgstr "" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1489,42 +1504,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2241,64 +2256,64 @@ msgstr "" msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1329 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr "" -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2346,8 +2361,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2361,7 +2376,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2420,7 +2435,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2496,58 +2511,53 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:228 -#, c-format -msgid "cannot open Packages database in %s\n" -msgstr "" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "" @@ -2556,26 +2566,21 @@ msgstr "" msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "" @@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3029,125 +3034,125 @@ msgstr "" msgid "error(%d) removing record %s from %s\n" msgstr "" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, c-format msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: 2001-08-29 13:55-0400\n" "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n" "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n" @@ -11,71 +11,66 @@ msgstr "" "Date: 1999-04-03 12:20+0200\n" "X-Generator: KBabel 0.8\n" -#: build.c:37 -#, c-format -msgid "cannot open rpm database in %s\n" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ RPM × %s\n" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÓÂÏÒËÉ:\n" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ %s: %s\n" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ËÁÎÁÌÁ tar: %m\n" #. Give up -#: build.c:178 +#: build.c:162 #, c-format msgid "Failed to read spec file from %s\n" msgstr "ïÛÉÂËÁ ÞÔÅÎÉÑ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ ÉÚ %s\n" -#: build.c:206 +#: build.c:190 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÉÍÅÎÏ×ÁÔØ %s × %s: %m\n" -#: build.c:245 +#: build.c:229 #, c-format msgid "failed to stat %s: %m\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÉÎÆÏÒÍÁÃÉÀ Ï %s: %m\n" -#: build.c:250 +#: build.c:234 #, c-format msgid "File %s is not a regular file.\n" msgstr "îÅ ÏÂÙÞÎÙÊ ÆÁÊÌ: %s.\n" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "æÁÊÌ %s ÎÅ ÐÏÈÏÖ ÎÁ ÆÁÊÌ ÓÐÅÃÉÆÉËÁÃÉÉ.\n" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "ðÌÁÔÆÏÒÍÙ ÄÌÑ ÓÂÏÒËÉ: %s\n" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "óÂÏÒËÁ ÄÌÑ ÐÌÁÔÆÏÒÍÙ %s\n" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "ÚÁÄÁÎÎÙÊ ÁÒÇÕÍÅÎÔ ÎÅ Ñ×ÌÑÅÔÓÑ ÐÁËÅÔÏÍ RPM\n" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ ÚÁÇÏÌÏ×ËÁ ÉÚ ÐÁËÅÔÁ\n" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏ×ÔÏÒÎÏ ÏÔËÒÙÔØ payload: %s\n" @@ -411,44 +406,44 @@ msgstr "--sign ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÔÏÌØËÏ ÐÒÉ ÓÂÏÒËÅ ÐÁËÅÔÏ×" msgid "exec failed\n" msgstr "ÚÁÐÕÓË ÎÅ ÕÄÁÌÓÑ\n" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÐÅÒÅÓÂÏÒËÉ" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "ÎÅ ÚÁÄÁÎ ÆÁÊÌ ÓÐÅÃÉÆÉËÁÃÉÉ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÁ" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "ÎÅ ÚÁÄÁÎÙ tar-ÆÁÊÌÙ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÁ" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÕÄÁÌÅÎÉÑ" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÚÁÐÒÏÓÁ" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÄÌÑ ×ÅÒÉÆÉËÁÃÉÉ" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "ÎÅÏÖÉÄÁÎÎÙÅ ÁÒÇÕÍÅÎÔÙ ÄÌÑ --querytags " -#: rpmqv.c:1156 +#: rpmqv.c:1149 #, fuzzy msgid "no arguments given" msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÚÁÐÒÏÓÁ" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 msgid "Unable to open temp file.\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ.\n" @@ -659,7 +654,7 @@ msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ: %s\n" msgid "Could not open %%files file %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %%files %s: %s\n" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "ÓÔÒÏËÁ: %s\n" @@ -734,152 +729,152 @@ msgstr "getGidS: ÓÌÉÛËÏÍ ÍÎÏÇÏ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÇÒÕÐÐ.\n" msgid "Could not canonicalize hostname: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ËÁÎÏÎÉÚÉÒÏ×ÁÔØ ÉÍÑ ËÏÍÐØÀÔÅÒÁ: %s\n" -#: build/pack.c:81 +#: build/pack.c:79 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÁÒÈÉ×Á ÎÁ ÆÁÊÌÅ %s: %s\n" -#: build/pack.c:84 +#: build/pack.c:82 #, c-format msgid "create archive failed: %s\n" msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÁÒÈÉ×Á: %s\n" -#: build/pack.c:106 +#: build/pack.c:104 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "cpio_copy: ÏÛÉÂËÁ ÚÁÐÉÓÉ: %s\n" -#: build/pack.c:113 +#: build/pack.c:111 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "cpio_copy: ÏÛÉÂËÁ ÞÔÅÎÉÑ: %s\n" -#: build/pack.c:216 +#: build/pack.c:214 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PreIn: %s\n" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PreUn: %s\n" -#: build/pack.c:230 +#: build/pack.c:228 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PostIn: %s\n" -#: build/pack.c:237 +#: build/pack.c:235 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PostUn: %s\n" -#: build/pack.c:245 +#: build/pack.c:243 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ VerifyScript: %s\n" -#: build/pack.c:260 +#: build/pack.c:258 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ Trigger script: %s\n" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "readRPM: ÏÔËÒÙÔÉÅ %s: %s\n" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "readRPM: ÞÔÅÎÉÅ %s: %s\n" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: ÏÛÉÂËÁ Fseek: %s\n" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s ÎÅ Ñ×ÌÑÅÔÓÑ ÐÁËÅÔÏÍ RPM\n" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: ÞÉÔÁÅÔÓÑ ÚÁÇÏÌÏ×ÏË ÉÚ %s\n" -#: build/pack.c:475 +#: build/pack.c:467 msgid "Unable to create immutable header region.\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÍÅÓÔÉÔØ ÚÁÇÏÌÏ×ÏË × ÎÅÒÐÅÒÙ×ÎÕÀ ÏÂÌÁÓÔØ ÐÁÍÑÔÉ.\n" -#: build/pack.c:493 +#: build/pack.c:485 msgid "Unable to write temp header\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ×ÒÅÍÅÎÎÙÊ ÚÁÇÏÌÏ×ÏË\n" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "îÅ×ÅÒÎÙÅ ÄÁÎÎÙÅ CSA\n" -#: build/pack.c:536 +#: build/pack.c:528 msgid "Unable to write final header\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÏËÏÎÞÁÔÅÌØÎÙÊ ÚÁÇÏÌÏ×ÏË\n" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "çÅÎÅÒÉÒÕÅÔÓÑ ÐÏÄÐÉÓØ: %d\n" -#: build/pack.c:567 +#: build/pack.c:559 msgid "Unable to reload signature header.\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÚÁÇÒÕÚÉÔØ ÚÁÇÏÌÏ×ÏË ÐÏÄÐÉÓÉ.\n" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÐÁËÅÔ: %s\n" -#: build/pack.c:626 +#: build/pack.c:618 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÃÅÌØ ÐÏÄÐÉÓÉ %s: %s\n" -#: build/pack.c:636 +#: build/pack.c:628 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÚÁÇÏÌÏ×ÏË ÉÚ %s: %s\n" -#: build/pack.c:650 +#: build/pack.c:642 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÚÁÇÏÌÏ×ÏË × %s: %s\n" -#: build/pack.c:660 +#: build/pack.c:652 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÓÏÄÅÒÖÉÍÏÅ ÉÚ %s: %s\n" -#: build/pack.c:666 +#: build/pack.c:658 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÓÏÄÅÒÖÉÍÏÅ × %s: %s\n" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "úÁÐÉÓÁÎ: %s\n" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÉÍÑ ÆÁÊÌÁ ÄÌÑ ÐÁËÅÔÁ %s: %s\n" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n" @@ -1447,7 +1442,7 @@ msgid " failed - " msgstr "ÎÅ ÕÄÁÌÏÓØ - " #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -1456,65 +1451,85 @@ msgstr "" "ÄÌÑ ÚÁ×ÉÓÉÍÏÓÔÉ \"B\" ÎÕÖÎÏ ÕËÁÚÁÔØ \"epoch\" (ÔÁË ÖÅ ËÁË ÄÌÑ \"A\")\n" "\tA %s\tB %s\n" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "äá" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "îåT" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, c-format +msgid "cannot open Packages database in %s\n" +msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, fuzzy, c-format +msgid "package %s already added, ignoring\n" +msgstr "ÐÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "%s: %-45s YES (added files)\n" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "%s: %-45s YES (added provide)\n" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-s (cached)\n" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s YES (rpmrc provides)\n" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s YES (rpmlib provides)\n" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s YES (db files)\n" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s YES (db provides)\n" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s YES (db package)\n" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NO\n" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) ÄÏÂÁ×ÌÅÎÏ × ËÅÛ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" @@ -1522,44 +1537,44 @@ msgstr "%s: (%s, %s) ÄÏÂÁ×ÌÅÎÏ × ËÅÛ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n" #. conflicts exist. -#: lib/depends.c:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "ÐÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó: %s\n" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "========== ÚÁÐÉÓØ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== ÓÏÒÔÉÒÏ×ËÁ ÐÁËÅÔÏ× (ÏÞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, " "ÇÌÕÂÉÎÁ)\n" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "========== ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌÉ (× ÐÏÒÑÄËÅ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ)\n" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "ãéëì:\n" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "========== ÐÒÏÄÏÌÖÅÎÉÅ ÕÐÏÒÑÄÏÞÅÎÉÑ ...\n" @@ -2296,64 +2311,64 @@ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %%%s %s\n" msgid "cannot write to %%%s %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÉÓÁÔØ × %%%s %s\n" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "ÏÂÎÁÒÕÖÅÎ Ä×ÏÉÞÎÙÊ ÐÁËÅÔ ×ÍÅÓÔÏ ÏÖÉÄÁÅÍÏÇÏ ÉÓÈÏÄÎÏÇÏ\n" -#: lib/psm.c:1330 +#: lib/psm.c:1329 msgid "source package contains no .spec file\n" msgstr "ÉÓÈÏÄÎÙÊ ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ\n" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: ×ÙÐÏÌÎÑÅÔÓÑ ÓÃÅÎÁÒÉÊ %s (ÅÓÌÉ ÅÓÔØ)\n" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "ÏÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ÓÃÅÎÁÒÉÑ %s ÉÚ %s-%s-%s, waitpid() ×ÏÚ×ÒÁÔÉÌ %s\n" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "ÏÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ÓÃÅÎÁÒÉÑ %s ÉÚ %s-%s-%s, ËÏÄ ×ÏÚ×ÒÁÔÁ %d\n" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s ÓÏÄÅÒÖÉÔ %d ÆÁÊÌÏ×, test = %d\n" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "%s: ÏÛÉÂËÁ ÓÃÅÎÁÒÉÑ %s (%d), %s-%s-%s ÐÒÏÐÕÓËÁÅÔÓÑ\n" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "ÐÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "ÇÒÕÐÐÁ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "ÒÁÓÐÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s\n" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr " ÎÁ ÆÁÊÌÅ " -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ÏÛÉÂËÁ ÎÁ ÆÁÊÌÅ %s: %s\n" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, c-format msgid "%s failed: %s\n" msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n" @@ -2401,8 +2416,8 @@ msgstr "ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÓÐÉÓËÏ× ÎÉ ÈÏÚÑÅ× ÆÁÊÌÏ×, ÎÉ ÉÈ ID\n" msgid "can't query %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÒÏÓÉÔØ %s: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" @@ -2416,7 +2431,7 @@ msgstr "ÏÛÉÂËÁ ÚÁÐÒÏÓÁ %s\n" msgid "old format source packages cannot be queried\n" msgstr "ÚÁÐÒÏÓÙ Ë ÉÓÈÏÄÎÙÍ ÐÁËÅÔÁÍ × ÓÔÁÒÏÍ ÆÏÒÍÁÔÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: ÏÛÉÂËÁ ÞÔÅÎÉÑ ÓÐÉÓËÁ ÆÁÊÌÏ×: %s\n" @@ -2475,7 +2490,7 @@ msgstr "ÎÏÍÅÒ ÚÁÐÉÓÉ ÐÁËÅÔÁ: %u\n" msgid "record %u could not be read\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÚÁÐÉÓØ %u\n" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" @@ -2551,58 +2566,53 @@ msgstr "ðÏÄÇÏÔÏ×ËÁ..." msgid "Preparing packages for installation..." msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× ÄÌÑ ÕÓÔÁÎÏ×ËÉ..." -#: lib/rpminstall.c:228 -#, c-format -msgid "cannot open Packages database in %s\n" -msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "úÁÇÒÕÖÁÅÔÓÑ %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr " ... ËÁË %s\n" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s ÐÒÏÐÕÓËÁÅÔÓÑ - ÏÛÉÂËÁ ÐÅÒÅÄÁÞÉ - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "ÐÁËÅÔ %s - ÎÅ ÐÅÒÅÍÅÝÁÅÍÙÊ\n" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ ÉÚ ÆÁÊÌÁ %s\n" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "ÄÌÑ ÆÁÊÌÁ %s ÎÅÏÂÈÏÄÉÍÁ ÂÏÌÅÅ ÎÏ×ÁÑ ×ÅÒÓÉÑ RPM\n" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "ÎÁÊÄÅÎÏ %d ÉÓÈÏÄÎÙÈ É %d ÂÉÎÁÒÎÙÈ ÐÁËÅÔÏ×\n" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÂÉÎÁÒÎÙÅ ÐÁËÅÔÙ\n" @@ -2611,26 +2621,21 @@ msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÂÉÎÁÒÎÙÅ ÐÁËÅÔÙ\n" msgid "cannot open file %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %s: %s\n" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ %s/packages.rpm\n" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ÚÁÄÁÅÔ ÎÅÓËÏÌØËÏ ÐÁËÅÔÏ×\n" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "ÕÄÁÌÅÎÉÅ ÜÔÉÈ ÐÁËÅÔÏ× ÎÁÒÕÛÉÔ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ %s\n" @@ -2887,7 +2892,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "%s ÐÒÏÐÕÝÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "ÉÓËÌÀÞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n" @@ -3100,11 +3105,11 @@ msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n" msgid "error(%d) removing record %s from %s\n" msgstr "ÏÛÉÂËÁ(%d) ÕÄÁÌÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s\n" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" @@ -3113,115 +3118,115 @@ msgstr "" "ÂÁÚÙ ÄÁÎÎÙÈ ÎÏ×ÏÇÏ ÆÏÒÍÁÔÁ\n" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, c-format msgid "error(%d) counting packages\n" msgstr "ÏÛÉÂËÁ(%d) ÐÒÉ ÐÏÄÓÞ£ÔÅ ÐÁËÅÔÏ×\n" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "ÚÁÐÉÓØ ÎÏÍÅÒ %u × ÂÁÚÅ ÄÁÎÎÙÈ ÎÅ×ÅÒÎÁ, ÐÒÏÐÕÓËÁÅÔÓÑ.\n" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "rpmdb: ÐÏÌÕÞÅÎ ÐÏ×ÒÅÖÄÅÎÎÙÊ ÚÁÇÏÌÏ×ÏË #%u, ÐÒÏÐÕÓËÁÅÔÓÑ.\n" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ ÚÁÇÏÌÏ×ÏË × 0x%x\n" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "ÕÄÁÌÑÅÔÓÑ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s.\n" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing %d entries from %s index.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ ÉÚ ÉÎÄÅËÓÁ %s.\n" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "ÏÛÉÂËÁ(%d) ÒÅÚÅÒ×ÉÒÏ×ÁÎÉÑ ÐÁÍÑÔÉ ÄÌÑ ÏÂÒÁÚÁ ÎÏ×ÏÇÏ ÐÁËÅÔÁ\n" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ \"%s\" × ÉÎÄÅËÓ %s.\n" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, c-format msgid "adding %d entries to %s index.\n" msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ × ÉÎÄÅËÓ %s\n" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s ÐÏÓÌÅ ÕÓÐÅÛÎÏÇÏ ÚÁ×ÅÒÛÅÎÉÑ ÐÅÒÅÉÎÄÅËÁÃÉÉ ÂÁÚÙ × db3.\n" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "ÐÅÒÅÓÔÒÁÉ×ÁÅÔÓÑ ÂÁÚÁ ÄÁÎÎÙÈ %s × %s\n" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "×ÒÅÍÅÎÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ\n" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, c-format msgid "creating directory %s\n" msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, c-format msgid "creating directory %s: %s\n" msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s: %s\n" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÎÏ×ÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, c-format msgid "cannot add record originally at %u\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÚÁÐÉÓØ (ÐÅÒ×ÏÎÁÞÁÌØÎÏ × %u)\n" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "ÐÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÍÅÎÉÔØ ÓÔÁÒÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÎÁ ÎÏ×ÕÀ!\n" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "ÆÁÊÌÙ × %s ÚÁÍÅÎÑÀÔÓÑ ÆÁÊÌÁÍÉ ÉÚ %s ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, c-format msgid "removing directory %s\n" msgstr "ÕÄÁÌÑÅÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n" @@ -3433,6 +3438,12 @@ msgstr "url ÐÏÒÔ ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏÍ\n" msgid "failed to create %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n" +#~ msgid "cannot open rpm database in %s\n" +#~ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ RPM × %s\n" + +#~ msgid "cannot open %s/packages.rpm\n" +#~ msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ %s/packages.rpm\n" + #~ msgid "add a signature to a package" #~ msgstr "ÄÏÂÁ×ÉÔØ ÐÏÄÐÉÓØ Ë ÐÁËÅÔÕ" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n" "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n" @@ -9,72 +9,67 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:37 -#, fuzzy, c-format -msgid "cannot open rpm database in %s\n" -msgstr "nie je mo¾né otvori» %s/packages.rpm\n" - -#: build.c:48 +#: build.c:36 #, fuzzy msgid "failed build dependencies:\n" msgstr "nevyrie¹ené závislosti:\n" -#: build.c:81 +#: build.c:65 #, fuzzy, c-format msgid "Unable to open spec file %s: %s\n" msgstr "Nie je mo¾né otvori» spec súbor: %s\n" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, fuzzy, c-format msgid "Failed to open tar pipe: %m\n" msgstr "Otvorenie rúry pre tar zlyhalo: %s\n" #. Give up -#: build.c:178 +#: build.c:162 #, fuzzy, c-format msgid "Failed to read spec file from %s\n" msgstr "Nie je mo¾né preèíta» spec súbor z %s\n" -#: build.c:206 +#: build.c:190 #, fuzzy, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "Nie je mo¾né premenova» %s na %s: %s\n" -#: build.c:245 +#: build.c:229 #, fuzzy, c-format msgid "failed to stat %s: %m\n" msgstr "nepodarilo sa zisti» stav %s: %s" -#: build.c:250 +#: build.c:234 #, fuzzy, c-format msgid "File %s is not a regular file.\n" msgstr "Súbor nie je obyèajný súbor: %s\n" -#: build.c:259 +#: build.c:243 #, fuzzy, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "%s zrejme nie je RPM balík\n" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, fuzzy, c-format msgid "Building target platforms: %s\n" msgstr "predefinova» cieµovú platformu" -#: build.c:329 +#: build.c:316 #, fuzzy, c-format msgid "Building for target %s\n" msgstr "vyhµadáva sa balík %s\n" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "argument nie je RPM balík\n" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "chyba pri èítaní hlavièky balíka\n" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, fuzzy, c-format msgid "cannot re-open payload: %s\n" msgstr "nie je mo¾né otvori» súbor %s\n" @@ -412,44 +407,44 @@ msgstr "--sign mô¾e by» pou¾íté iba poèas zostavenia balíka" msgid "exec failed\n" msgstr "vykonanie zlyhalo\n" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "neboli zadané ¾iadne balíky pre znovuzostavenie" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "neboli zadané ¾iadne spec-súbory pre zostavenie" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "neboli zadané ¾iadne tar-súbory pre zostavenie" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "neboli zadané ¾iadne balíky pre odin¹talovanie" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "neboli zadané ¾iadne balíky pre in¹taláciu" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "neboli zadané ¾iadne argumenty pre otázku" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "neboli zadané ¾iadne argumenty pre overenie" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "neoèakávané argumenty pre --querytags" -#: rpmqv.c:1156 +#: rpmqv.c:1149 #, fuzzy msgid "no arguments given" msgstr "neboli zadané ¾iadne argumenty pre otázku" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 #, fuzzy msgid "Unable to open temp file.\n" msgstr "Nie je mo¾né otvori» doèasný súbor" @@ -670,7 +665,7 @@ msgstr "Súbor nebol nájdený: %s" msgid "Could not open %%files file %s: %s\n" msgstr "chybe: nie je mo¾né otvori» %%files súbor: %s" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, fuzzy, c-format msgid "line: %s\n" msgstr "riadok: %s" @@ -745,157 +740,157 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "Nie je mo¾né kanonizova» názov poèítaèa: %s\n" -#: build/pack.c:81 +#: build/pack.c:79 #, fuzzy, c-format msgid "create archive failed on file %s: %s\n" msgstr "vytvorenie archívu zlyhalo pri súbore %s: %s" -#: build/pack.c:84 +#: build/pack.c:82 #, fuzzy, c-format msgid "create archive failed: %s\n" msgstr "vytvorenie archívu zlyhalo pri súbore %s: %s" -#: build/pack.c:106 +#: build/pack.c:104 #, fuzzy, c-format msgid "cpio_copy write failed: %s\n" msgstr "cpio_copy zápis zlyhal: %s" -#: build/pack.c:113 +#: build/pack.c:111 #, fuzzy, c-format msgid "cpio_copy read failed: %s\n" msgstr "cpio_copy èítanie zlyhalo: %s" -#: build/pack.c:216 +#: build/pack.c:214 #, fuzzy, c-format msgid "Could not open PreIn file: %s\n" msgstr "Nie je mo¾né otvori» PreIn súbor: %s" -#: build/pack.c:223 +#: build/pack.c:221 #, fuzzy, c-format msgid "Could not open PreUn file: %s\n" msgstr "Nie je mo¾né otvori» PreUn súbor: %s" -#: build/pack.c:230 +#: build/pack.c:228 #, fuzzy, c-format msgid "Could not open PostIn file: %s\n" msgstr "Nie je mo¾né otvori» PostIn súbor: %s" -#: build/pack.c:237 +#: build/pack.c:235 #, fuzzy, c-format msgid "Could not open PostUn file: %s\n" msgstr "Nie je mo¾né otvori» PostUn súbor: %s" -#: build/pack.c:245 +#: build/pack.c:243 #, fuzzy, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "Nie je mo¾né otvori» VerifyScript súbor: %s" -#: build/pack.c:260 +#: build/pack.c:258 #, fuzzy, c-format msgid "Could not open Trigger script file: %s\n" msgstr "Nie je mo¾né otvori» Trigger skriptový súbor: %s" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "readRPM: otvorenie %s: %s\n" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "readRPM: èítanie %s: %s\n" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, fuzzy, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: readLead zlyhalo\n" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s nie je RPM balík\n" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: èítanie hlavièky %s\n" -#: build/pack.c:475 +#: build/pack.c:467 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "Nie je mo¾né preèíta» ikonu: %s" -#: build/pack.c:493 +#: build/pack.c:485 #, fuzzy msgid "Unable to write temp header\n" msgstr "Nie je mo¾né zapísa» %s" -#: build/pack.c:501 +#: build/pack.c:493 #, fuzzy msgid "Bad CSA data\n" msgstr "Chybné CSA dáta" -#: build/pack.c:536 +#: build/pack.c:528 #, fuzzy msgid "Unable to write final header\n" msgstr "Nie je mo¾né zapísa» %s" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "Vytvára sa PGP podpis: %d\n" -#: build/pack.c:567 +#: build/pack.c:559 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "Nie je mo¾né preèíta» ikonu: %s" -#: build/pack.c:575 +#: build/pack.c:567 #, fuzzy, c-format msgid "Could not open %s: %s\n" msgstr "Otvorenie %s zlyhalo\n" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nie je mo¾né zapísa» balík: %s" -#: build/pack.c:626 +#: build/pack.c:618 #, fuzzy, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "Nie je preèíta» sigtarget: %s" -#: build/pack.c:636 +#: build/pack.c:628 #, fuzzy, c-format msgid "Unable to read header from %s: %s\n" msgstr "Nie je mo¾né preèíta» ikonu: %s" -#: build/pack.c:650 +#: build/pack.c:642 #, fuzzy, c-format msgid "Unable to write header to %s: %s\n" msgstr "Nie je mo¾né zapísa» balík: %s" -#: build/pack.c:660 +#: build/pack.c:652 #, fuzzy, c-format msgid "Unable to read payload from %s: %s\n" msgstr "Nie je mo¾né preèíta» ikonu: %s" -#: build/pack.c:666 +#: build/pack.c:658 #, fuzzy, c-format msgid "Unable to write payload to %s: %s\n" msgstr "Nie je mo¾né zapísa» balík: %s" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "Zapísané: %s\n" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "Nie je mo¾né vytvori» meno výstupného súboru pre balík %s: %s\n" -#: build/pack.c:775 +#: build/pack.c:767 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "nie je mo¾né zapísa» do %s: " @@ -1470,73 +1465,93 @@ msgid " failed - " msgstr " zlyhalo - " #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 #, fuzzy msgid "NO " msgstr "NIE JE V PORIADKU" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, fuzzy, c-format +msgid "cannot open Packages database in %s\n" +msgstr "nie je mo¾né otvori» %s/packages.rpm\n" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, fuzzy, c-format +msgid "package %s already added, ignoring\n" +msgstr "balík %s nie je nain¹talovaný\n" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" @@ -1544,42 +1559,42 @@ msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, 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:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "balík %s koliduje: %s\n" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "odstraòuje sa index skupín\n" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2347,66 +2362,66 @@ msgstr "nie je mo¾né zapísa» do %s: " msgid "cannot write to %%%s %s\n" msgstr "nie je mo¾né zapísa» do %s: " -#: lib/psm.c:1217 +#: lib/psm.c:1216 #, fuzzy msgid "source package expected, binary found\n" msgstr "oèakávaný zdrojový balík, nájdený binárny" -#: lib/psm.c:1330 +#: lib/psm.c:1329 #, fuzzy msgid "source package contains no .spec file\n" msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "vykonanie skriptu zlyhalo" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "vykonanie skriptu zlyhalo" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "balík: %s-%s-%s test súborov = %d\n" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "pou¾ívateµ %s neexistuje - pou¾ije sa root" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ije sa root" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalenie archívu zlyhalo%s%s: %s" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr " pre súbor " -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nepodarilo sa otvori» %s: %s" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s zlyhalo" @@ -2455,8 +2470,8 @@ msgstr "balík neobsahuje ani vlastníka súboru, ani zoznamy identifikácií" msgid "can't query %s: %s\n" msgstr "zmazanie %s zlyhalo: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "otvorenie %s zlyhalo\n" @@ -2470,7 +2485,7 @@ msgstr "otázka na %s zlyhala\n" msgid "old format source packages cannot be queried\n" msgstr "nie je mo¾né pýta» sa zdrojových balíkov v starom formáte\n" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: readLead zlyhalo\n" @@ -2530,7 +2545,7 @@ msgstr "po¾aduje sa záznam èíslo %d\n" msgid "record %u could not be read\n" msgstr "záznam %d nie je mo¾né preèíta»\n" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "balík %s nie je nain¹talovaný\n" @@ -2608,58 +2623,53 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "neboli zadané ¾iadne balíky pre in¹taláciu" -#: lib/rpminstall.c:228 -#, fuzzy, c-format -msgid "cannot open Packages database in %s\n" -msgstr "nie je mo¾né otvori» %s/packages.rpm\n" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "Prená¹a sa %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "... ako %s\n" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s vynechané - prenos zlyhal - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "chyba pri vytváraní doèasného súboru %s" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie je mo¾né nain¹talova»\n" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "nájdených %d zdrojových a %d binárnych balíkov\n" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "nevyrie¹ené závislosti:\n" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "in¹talujú sa binárne balíky\n" @@ -2668,26 +2678,21 @@ msgstr "in¹talujú sa binárne balíky\n" msgid "cannot open file %s: %s\n" msgstr "nie je mo¾né otvori» súbor %s: %s" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "nie je mo¾né otvori» %s/packages.rpm\n" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¹pecifikuje viac balíkov\n" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "odstránenie týchto balíkov by poru¹ilo závislosti:\n" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie je mo¾né otvori» %s\n" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "In¹taluje sa %s\n" @@ -2953,7 +2958,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "%s vynechané kvôli príznaku missingok\n" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "vytvára sa adresár %s\n" @@ -3162,12 +3167,12 @@ msgstr "chyba pri zápise záznamu %s do %s" msgid "error(%d) removing record %s from %s\n" msgstr "chyba pri odstraòovaní záznamu %s z %s" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 #, fuzzy msgid "no dbpath has been set\n" msgstr "nebola nastavená ¾iadna dbpath" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 #, fuzzy msgid "" "old format database is present; use --rebuilddb to generate a new format " @@ -3177,115 +3182,115 @@ msgstr "" "databázy v novom formáte" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, fuzzy, c-format msgid "error(%d) counting packages\n" msgstr "chyba pri hµadaní balíka %s\n" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "záznam èíslo %d v databáze je chybný -- bol vynechaný" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "nie je mo¾né preèíta» hlavièku na %d pre vyhµadanie" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstraòuje sa index skupín\n" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstraòuje sa index názvov\n" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "chyba pri hµadaní balíka %s\n" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "premenováva sa %s na %s\n" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "premenováva sa %s na %s\n" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "nebola nastavená ¾iadna dbpath" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "znovu sa vytvára databáza v adresári %s\n" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "doèasná databáza %s u¾ existuje" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "otvára sa stará databáza\n" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "otvára sa nová databáza\n" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "nie je mo¾né prida» záznam pôvodne na %d" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "nepodarilo sa znovu vytvori» databázu; zostáva pôvodná\n" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "nepodarilo sa nahradi» starú databázu novou!\n" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "nahradí súbory v %s súbormi z %s kvôli obnove" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "nepodarilo sa odstráni» adresár %s: %s\n" @@ -3501,6 +3506,13 @@ msgstr "url port musí by» èíslo\n" msgid "failed to create %s: %s\n" msgstr "nepodarilo sa vytvori» %s\n" +#, fuzzy +#~ msgid "cannot open rpm database in %s\n" +#~ msgstr "nie je mo¾né otvori» %s/packages.rpm\n" + +#~ msgid "cannot open %s/packages.rpm\n" +#~ msgstr "nie je mo¾né otvori» %s/packages.rpm\n" + #~ msgid "add a signature to a package" #~ msgstr "prida» podpis balíku" @@ -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 <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000. -# $Id: sl.po,v 1.174 2001/10/26 04:16:46 jbj Exp $ +# $Id: sl.po,v 1.175 2001/10/27 20:09:35 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -14,71 +14,66 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:37 -#, fuzzy, c-format -msgid "cannot open rpm database in %s\n" -msgstr "datoteke %s/packages.rpm ni mogo¾no odpreti\n" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "izdelava soodvisnosti je bila neuspe¹na:\n" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "Datoteke s specifikacijami %s ni mo¾no odpreti: %s\n" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, fuzzy, c-format msgid "Failed to open tar pipe: %m\n" msgstr "Povezava s programom tar je bila neuspe¹na: %m\n" #. Give up -#: build.c:178 +#: build.c:162 #, fuzzy, c-format msgid "Failed to read spec file from %s\n" msgstr "Neuspe¹no branje datoteke s specifikacijami iz %s" -#: build.c:206 +#: build.c:190 #, fuzzy, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "Preimenovanje %s v %s je bilo neuspe¹no: %m" -#: build.c:245 +#: build.c:229 #, fuzzy, c-format msgid "failed to stat %s: %m\n" msgstr "status %s ni na voljo: %s" -#: build.c:250 +#: build.c:234 #, fuzzy, c-format msgid "File %s is not a regular file.\n" msgstr "Datoteka ni obièajna datoteka: %s\n" -#: build.c:259 +#: build.c:243 #, fuzzy, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "Ne ka¾e, da je %s datoteka s specifikacijami." #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "Izgradnja za ciljna strojna okolja: %s\n" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "Izgradnja za ciljni sistem %s\n" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "navedeni argument ni paket RPM\n" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "napaka pri branju glave paketa\n" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "ni mo¾no vnoviè odpreti (payload): %s\n" @@ -410,44 +405,44 @@ msgstr "--sign sme biti podan le ob izgradnji paketa" msgid "exec failed\n" msgstr "izvajanje je bilo neuspe¹no\n" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "paketi za vnovièno izgradnjo niso navedeni" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "datoteka spec za izgradnjo manjka" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "arhiv tar za izgradnjo manjka" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "paketi katere bi bilo potrebno odstraniti niso navedeni" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "paketi katere bi bilo potrebno namestiti niso navedeni" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "argumenti za poizvedbo niso podani" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "argumenti za preverjanje niso podani" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "neprièakovani argumenti za --querytags " -#: rpmqv.c:1156 +#: rpmqv.c:1149 #, fuzzy msgid "no arguments given" msgstr "argumenti za poizvedbo niso podani" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 #, fuzzy msgid "Unable to open temp file.\n" msgstr "Zaèasne datoteke ni mo¾no odpreti" @@ -668,7 +663,7 @@ msgstr "Datoteke ni mo¾no najti z raz¹iritvijo metaznakov v imenu: %s" msgid "Could not open %%files file %s: %s\n" msgstr "Datoteke %s iz %%files ni mo¾no odpreti: %s" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, fuzzy, c-format msgid "line: %s\n" msgstr "vrstica: %s" @@ -743,157 +738,157 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "Iskanje kanoniènega imena gostitelja je bilo neuspe¹no: %s\n" -#: build/pack.c:81 +#: build/pack.c:79 #, fuzzy, c-format msgid "create archive failed on file %s: %s\n" msgstr "ustvarjanje arhiva je bilo za datoteko %s neuspe¹no: %s" -#: build/pack.c:84 +#: build/pack.c:82 #, fuzzy, c-format msgid "create archive failed: %s\n" msgstr "ustvarjanje arhiva je bilo za datoteko %s neuspe¹no: %s" -#: build/pack.c:106 +#: build/pack.c:104 #, fuzzy, c-format msgid "cpio_copy write failed: %s\n" msgstr "pisanje cpio_copy neuspe¹no: %s" -#: build/pack.c:113 +#: build/pack.c:111 #, fuzzy, c-format msgid "cpio_copy read failed: %s\n" msgstr "branje cpio_copy neuspe¹no: %s" -#: build/pack.c:216 +#: build/pack.c:214 #, fuzzy, c-format msgid "Could not open PreIn file: %s\n" msgstr "Datoteke PreIn ni mo¾no odpreti: %s" -#: build/pack.c:223 +#: build/pack.c:221 #, fuzzy, c-format msgid "Could not open PreUn file: %s\n" msgstr "Datoteke PreUn ni mo¾no odpreti: %s" -#: build/pack.c:230 +#: build/pack.c:228 #, fuzzy, c-format msgid "Could not open PostIn file: %s\n" msgstr "Datoteke PostIn ni mo¾no odpreti: %s" -#: build/pack.c:237 +#: build/pack.c:235 #, fuzzy, c-format msgid "Could not open PostUn file: %s\n" msgstr "Datoteke PostUn ni mo¾no odpreti: %s" -#: build/pack.c:245 +#: build/pack.c:243 #, fuzzy, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "Datoteke VerifyScript ni mo¾no odpreti: %s" -#: build/pack.c:260 +#: build/pack.c:258 #, fuzzy, c-format msgid "Could not open Trigger script file: %s\n" msgstr "Skriptne datoteke Trigger ni mo¾no odpreti: %s" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "readRPM: odpiranje %s: %s\n" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "readRPM: branje %s: %s\n" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, fuzzy, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: branje Fread je bilo neuspe¹no: %s\n" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s ni paket tipa RPM\n" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: branje glave %s\n" -#: build/pack.c:475 +#: build/pack.c:467 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "Ikone %s ni mo¾no prebrati: %s" -#: build/pack.c:493 +#: build/pack.c:485 #, fuzzy msgid "Unable to write temp header\n" msgstr "Ni mo¾no zapisati paketa %s: %s" -#: build/pack.c:501 +#: build/pack.c:493 #, fuzzy msgid "Bad CSA data\n" msgstr "Po¹kodovani podatki CSA" -#: build/pack.c:536 +#: build/pack.c:528 #, fuzzy msgid "Unable to write final header\n" msgstr "Ni mo¾no zapisati paketa %s: %s" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "Izdelujemo podpis: %d\n" -#: build/pack.c:567 +#: build/pack.c:559 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "Ikone %s ni mo¾no prebrati: %s" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "Ni mo¾no odpreti %s: %s\n" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Ni mo¾no zapisati paketa: %s" -#: build/pack.c:626 +#: build/pack.c:618 #, fuzzy, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "Ciljnega podpisa %s ni mo¾no odpreti: %s" -#: build/pack.c:636 +#: build/pack.c:628 #, fuzzy, c-format msgid "Unable to read header from %s: %s\n" msgstr "Ikone %s ni mo¾no prebrati: %s" -#: build/pack.c:650 +#: build/pack.c:642 #, fuzzy, c-format msgid "Unable to write header to %s: %s\n" msgstr "Ni mo¾no zapisati paketa %s: %s" -#: build/pack.c:660 +#: build/pack.c:652 #, fuzzy, c-format msgid "Unable to read payload from %s: %s\n" msgstr "Ikone %s ni mo¾no prebrati: %s" -#: build/pack.c:666 +#: build/pack.c:658 #, fuzzy, c-format msgid "Unable to write payload to %s: %s\n" msgstr "Ni mo¾no zapisati paketa %s: %s" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "Neuspe¹no ustvarjanje izhodne datoteke za paket %s: %s\n" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "ni mo¾no ustvariti %s: %s\n" @@ -1471,7 +1466,7 @@ msgid " failed - " msgstr " neuspe¹no - " #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -1480,66 +1475,86 @@ msgstr "" "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n" "\tA %s\tB %s\n" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 #, fuzzy msgid "NO " msgstr "NI DOBRO" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, fuzzy, c-format +msgid "cannot open Packages database in %s\n" +msgstr "zbirko podatkov paketov ni mo¾no odpreti v %s\n" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, fuzzy, c-format +msgid "package %s already added, ignoring\n" +msgstr "paket %s-%s-%s je ¾e name¹èen" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, fuzzy, c-format msgid "%s: %-45s YES (added files)\n" msgstr "%s: %-45s DA (dodane datoteke)\n" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, fuzzy, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "%s: %-45s DA (dodane ponudbe)\n" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-3s (predpomnjeno)\n" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, fuzzy, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s DA (rpmrc ponudbe)\n" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s DA (rpmlib ponudbe)\n" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s DA (db datoteke)\n" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, fuzzy, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s DA (db ponudbe)\n" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %s zadovoljen ob paketih db.\n" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NE\n" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n" @@ -1547,42 +1562,42 @@ msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, 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:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "paket %s jw v sporu z: %s\n" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "odstranjujemo seznam skupin\n" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2348,66 +2363,66 @@ msgstr "ni mo¾no ustvariti %s: %s\n" msgid "cannot write to %%%s %s\n" msgstr "pisanje na %s ni mo¾no" -#: lib/psm.c:1217 +#: lib/psm.c:1216 #, fuzzy msgid "source package expected, binary found\n" msgstr "prièakovan je bil izvorni paket, najden binarni" -#: lib/psm.c:1330 +#: lib/psm.c:1329 #, fuzzy msgid "source package contains no .spec file\n" msgstr "izvorni paket ne vsebuje datoteke .spec" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "poganjanje ponamestitvenih skript (èe obstajajo)\n" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "skript se ni uspe¹no izvedel" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "skript se ni uspe¹no izvedel" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "paket: %s-%s-%s datoteke test = %d\n" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "uporabnik %s ne obstaja - uporabljam root" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s ne obstaja - uporabljam root" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "raz¹iritev arhiva je bilo neuspe¹no%s%s: %s" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr " za datoteko " -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspe¹no odpiranje %s: %s\n" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s neuspe¹en" @@ -2456,8 +2471,8 @@ msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id" msgid "can't query %s: %s\n" msgstr "ni mo¾no poizvedeti o %s: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "odpiranje %s je bilo neuspe¹no: %s\n" @@ -2471,7 +2486,7 @@ msgstr "poizvedba po %s je bila neuspe¹na\n" msgid "old format source packages cannot be queried\n" msgstr "poizvedba po izvornih paketih v stari obliki ni mo¾na\n" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: branje Fread je bilo neuspe¹no: %s\n" @@ -2531,7 +2546,7 @@ msgstr "¹tevilka zapisa paketa: %d\n" msgid "record %u could not be read\n" msgstr "zapisa %d ni mo¾no prebrati\n" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "paket %s ni name¹èen\n" @@ -2608,58 +2623,53 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "paketi za namestitev niso navedeni" -#: lib/rpminstall.c:228 -#, fuzzy, c-format -msgid "cannot open Packages database in %s\n" -msgstr "zbirko podatkov paketov ni mo¾no odpreti v %s\n" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "Prena¹anje %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr " ... kot %s\n" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "preskoèeno - %s - prenos neuspe¹en - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "paketa %s ni mo¾no premakniti\n" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "napaka pri branju iz datoteke %s\n" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "datoteka %s zahteva novej¹o razlièico RPM\n" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "%s ni mo¾no namestiti\n" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "najdeno %d izvornih in %d binarnih paketov\n" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "neuspe¹ne soodvisnosti:\n" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "name¹èanje binarnih paketov\n" @@ -2668,26 +2678,21 @@ msgstr "name¹èanje binarnih paketov\n" msgid "cannot open file %s: %s\n" msgstr "ni mo¾no odpreti datoteke %s: %s\n" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "datoteke %s/packages.rpm ni mo¾no odpreti\n" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" doloèa veè paketov\n" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "ni mo¾no odpreti %s: %s\n" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "Name¹èanje %s\n" @@ -2951,7 +2956,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "%s preskoèen zaradi manjkajoèe zastavice OK\n" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "izkljuèevanje imenika %s\n" @@ -3164,12 +3169,12 @@ msgstr "napaka(%d) pri pisanju zapisa %s v %s" msgid "error(%d) removing record %s from %s\n" msgstr "napaka(%d) pri brisanju zapisa %s iz %s" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath ni nastavljena" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 #, fuzzy msgid "" "old format database is present; use --rebuilddb to generate a new format " @@ -3178,117 +3183,117 @@ msgstr "" "da bi staro obliko zbirke podatkov pretvorili v novo po¾enite --rebuilddb" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, fuzzy, c-format msgid "error(%d) counting packages\n" msgstr "napaka(%d) pri ¹tetju paketov" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "zapis ¹t. %d v zbirki je po¹kodovan -- preskoèeno." -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: ni mo¾no prebrati glave pri 0x%x" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstranjevanje \"%s\" iz kazala %s.\n" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstranjevanje %d vnosov iz kazala %s\n" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "napaka(%d) pri iskanju paketa %s\n" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "dodajanje \"%s\" v kazalo %s.\n" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "dodajanje %d vnosov v kazalo %s.\n" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "dbpath ni nastavljena" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "zaèasna podatkovna zbirka %s ¾e obstaja" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "ustvarjanje imenika: %s\n" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "ustvarjanje imenika: %s\n" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "odpiranje stare podatkovne zbirke\n" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "odpiramo nove podatkovne zbirke z dbapi %d\n" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "zapisa ni mo¾no dodati na %d" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "" "ponovna izgradnja podatkovne zbirke je bila neuspe¹na; stara ostaja na\n" "istem mestu\n" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspe¹na!\n" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "poskus povrnitve z nadomestitvijo datotek v %s z datotekami v %s" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "odstranjevanje imenika: %s\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspe¹na odstranitev imenika %s: %s\n" @@ -3504,6 +3509,13 @@ msgstr "vrata URL morajo biti ¹tevilka\n" msgid "failed to create %s: %s\n" msgstr "neuspe¹no ustvarjanje %s: %s\n" +#, fuzzy +#~ msgid "cannot open rpm database in %s\n" +#~ msgstr "datoteke %s/packages.rpm ni mogo¾no odpreti\n" + +#~ msgid "cannot open %s/packages.rpm\n" +#~ msgstr "datoteke %s/packages.rpm ni mo¾no odpreti\n" + #~ msgid "add a signature to a package" #~ msgstr "paketu(-om) dodaj podpis" @@ -1,77 +1,72 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" -#: build.c:37 -#, fuzzy, c-format -msgid "cannot open rpm database in %s\n" -msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" - -#: build.c:48 +#: build.c:36 #, fuzzy msgid "failed build dependencies:\n" msgstr "lo¹e meðuzavisnosti:\n" -#: build.c:81 +#: build.c:65 #, fuzzy, c-format msgid "Unable to open spec file %s: %s\n" msgstr "Ne mogu da otvorim %s za èitanje: %s" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, fuzzy, c-format msgid "Failed to open tar pipe: %m\n" msgstr "neuspelo otvaranje %s\n" #. Give up -#: build.c:178 +#: build.c:162 #, fuzzy, c-format msgid "Failed to read spec file from %s\n" msgstr "Neuspelo èitanje %s: %s." -#: build.c:206 +#: build.c:190 #, fuzzy, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "Neuspelo èitanje %s: %s." -#: build.c:245 +#: build.c:229 #, fuzzy, c-format msgid "failed to stat %s: %m\n" msgstr "neuspelo otvaranje %s: %s" -#: build.c:250 +#: build.c:234 #, fuzzy, c-format msgid "File %s is not a regular file.\n" msgstr "%s ne lièi na RPM paket\n" -#: build.c:259 +#: build.c:243 #, fuzzy, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "%s ne lièi na RPM paket\n" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:329 +#: build.c:316 #, fuzzy, c-format msgid "Building for target %s\n" msgstr "gre¹ka potrage za paketom %s\n" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 #, fuzzy msgid "error reading header from package\n" msgstr "gre¹ka potrage za paketom %s\n" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, fuzzy, c-format msgid "cannot re-open payload: %s\n" msgstr "Ne mogu da otvorim datoteku %s: " @@ -403,44 +398,44 @@ msgstr "--sign se mo¾e koristiti samo kod kreiranja paketa" msgid "exec failed\n" msgstr "%s: Neuspelo otvaranje\n" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "nedosataje paket za rekreiranje" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "nedostaje specifikacije za kreiranje" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "nedostaju 'tar' datoteke za kreiranje" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "neodstaje paket za deinstalaciju" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "nedostaje paket za instalaciju" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "nedostaju argumenti za upit" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "nedostaju argumenti za proveru" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "neoèekivani argumenti za --querytags" -#: rpmqv.c:1156 +#: rpmqv.c:1149 #, fuzzy msgid "no arguments given" msgstr "nedostaju argumenti za upit" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 #, fuzzy msgid "Unable to open temp file.\n" msgstr "Ne mogu da otvorim %s za èitanje: %s" @@ -654,7 +649,7 @@ msgstr "Datoteka nije pronaðena na serveru" msgid "Could not open %%files file %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, fuzzy, c-format msgid "line: %s\n" msgstr "neuspelo otvaranje %s: %s" @@ -729,156 +724,156 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:79 #, fuzzy, c-format msgid "create archive failed on file %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/pack.c:84 +#: build/pack.c:82 #, fuzzy, c-format msgid "create archive failed: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/pack.c:106 +#: build/pack.c:104 #, fuzzy, c-format msgid "cpio_copy write failed: %s\n" msgstr "neuspelo èitanje: %s (%d)" -#: build/pack.c:113 +#: build/pack.c:111 #, fuzzy, c-format msgid "cpio_copy read failed: %s\n" msgstr "neuspelo èitanje: %s (%d)" -#: build/pack.c:216 +#: build/pack.c:214 #, fuzzy, c-format msgid "Could not open PreIn file: %s\n" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/pack.c:223 +#: build/pack.c:221 #, fuzzy, c-format msgid "Could not open PreUn file: %s\n" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/pack.c:230 +#: build/pack.c:228 #, fuzzy, c-format msgid "Could not open PostIn file: %s\n" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/pack.c:237 +#: build/pack.c:235 #, fuzzy, c-format msgid "Could not open PostUn file: %s\n" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/pack.c:245 +#: build/pack.c:243 #, fuzzy, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/pack.c:260 +#: build/pack.c:258 #, fuzzy, c-format msgid "Could not open Trigger script file: %s\n" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/pack.c:288 +#: build/pack.c:286 #, fuzzy, c-format msgid "readRPM: open %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/pack.c:298 +#: build/pack.c:296 #, fuzzy, c-format msgid "readRPM: read %s: %s\n" msgstr "Neuspelo èitanje %s: %s." -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, fuzzy, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: Neuspeo 'readLead'\n" -#: build/pack.c:341 +#: build/pack.c:333 #, fuzzy, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "gre¹ka: èini se da %s nije RPM paket\n" -#: build/pack.c:350 +#: build/pack.c:342 #, fuzzy, c-format msgid "readRPM: reading header from %s\n" msgstr "gre¹ka kod uzimanja sloga %s iz %s" -#: build/pack.c:475 +#: build/pack.c:467 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:493 +#: build/pack.c:485 #, fuzzy msgid "Unable to write temp header\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:536 +#: build/pack.c:528 #, fuzzy msgid "Unable to write final header\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:554 +#: build/pack.c:546 #, fuzzy, c-format msgid "Generating signature: %d\n" msgstr "napravi PGP potpis" -#: build/pack.c:567 +#: build/pack.c:559 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:575 +#: build/pack.c:567 #, fuzzy, c-format msgid "Could not open %s: %s\n" msgstr "neuspelo otvaranje %s\n" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:626 +#: build/pack.c:618 #, fuzzy, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:636 +#: build/pack.c:628 #, fuzzy, c-format msgid "Unable to read header from %s: %s\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:650 +#: build/pack.c:642 #, fuzzy, c-format msgid "Unable to write header to %s: %s\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:660 +#: build/pack.c:652 #, fuzzy, c-format msgid "Unable to read payload from %s: %s\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:666 +#: build/pack.c:658 #, fuzzy, c-format msgid "Unable to write payload to %s: %s\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:775 +#: build/pack.c:767 #, fuzzy, c-format msgid "cannot create %s: %s\n" msgstr "Ne mogu da otvorim datoteku %s: " @@ -1455,72 +1450,92 @@ msgid " failed - " msgstr "PGP omanuo" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, fuzzy, c-format +msgid "cannot open Packages database in %s\n" +msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, fuzzy, c-format +msgid "package %s already added, ignoring\n" +msgstr "paket %s nije instaliran\n" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "datoteka %s ne pripada nijednom paketu\n" @@ -1528,42 +1543,42 @@ msgstr "datoteka %s ne pripada nijednom paketu\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, 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:1535 +#: lib/depends.c:1747 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "paket %s nije naveden u %s" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2333,65 +2348,65 @@ msgstr "Ne mogu da otvorim datoteku %s: " msgid "cannot write to %%%s %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1329 #, fuzzy msgid "source package contains no .spec file\n" msgstr "upit nad paketom koji ima <datoteku>" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "nemoj izvr¹iti nijednu fazu" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "neuspelo izvr¹avanje skripta" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "neuspelo izvr¹avanje skripta" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr "" -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "PGP omanuo" @@ -2441,8 +2456,8 @@ msgstr "paket nema imena" msgid "can't query %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "neuspelo otvaranje %s: %s\n" @@ -2456,7 +2471,7 @@ msgstr "upit nad %s neuspeo\n" msgid "old format source packages cannot be queried\n" msgstr "Upit se ne mo¾e izvesti nad izvorni paketima u starom formatu\n" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: Neuspeo 'readLead'\n" @@ -2516,7 +2531,7 @@ msgstr "pogre¹an broj paketa: %s\n" msgid "record %u could not be read\n" msgstr "ne mogu da proèitam slog %d\n" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "paket %s nije instaliran\n" @@ -2595,58 +2610,53 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "nedostaje paket za instalaciju" -#: lib/rpminstall.c:228 -#, fuzzy, c-format -msgid "cannot open Packages database in %s\n" -msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "Pribavljam %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "gre¹ka: preskaèem %s - neuspelo preno¹enje - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "paket %s nije instaliran\n" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "gre¹ka: %s se ne mo¾e instalirati\n" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "lo¹e meðuzavisnosti:\n" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 #, fuzzy msgid "installing binary packages\n" msgstr "instaliraj paket" @@ -2656,26 +2666,21 @@ msgstr "instaliraj paket" msgid "cannot open file %s: %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/rpminstall.c:611 -#, fuzzy, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" odreðuje vi¹e paketa\n" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "uklanjanje oviha paketa æe naru¹iti zavisnosti:\n" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "Instaliram %s\n" @@ -2942,7 +2947,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" @@ -3145,126 +3150,126 @@ msgstr "gre¹ka zapisivanja sloga %s u %s" msgid "error(%d) removing record %s from %s\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath nije odreðen" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, fuzzy, c-format msgid "error(%d) counting packages\n" msgstr "gre¹ka kod potrage za paketom %s\n" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "slog broj %d u bazi podataka je neispravan -- preskaèem ga" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "ne mogu da proèitam zaglavlje na %d za proveru" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "gre¹ka kod potrage za paketom %s\n" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "dbpath nije odreðen" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "privremena baza podataka %s veæ postoji" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "ne mogu da dodam slog originalno na %d" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspelo otvaranje %s: %s" @@ -3487,6 +3492,14 @@ msgstr "gre¹ka: FTP port mora biti broj\n" msgid "failed to create %s: %s\n" msgstr "neuspelo kreiranje %s\n" +#, fuzzy +#~ msgid "cannot open rpm database in %s\n" +#~ msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" + +#, fuzzy +#~ msgid "cannot open %s/packages.rpm\n" +#~ msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" + #~ msgid "add a signature to a package" #~ msgstr "dodaj potpis u paket" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: 2001-09-12 14:18+0200\n" "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -9,71 +9,66 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: build.c:37 -#, c-format -msgid "cannot open rpm database in %s\n" -msgstr "kan inte öppna rpmdatabas i %s\n" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "ouppfyllda byggberoenden:\n" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "Kan inte öppna specfilen %s: %s\n" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "Kunde inte öppna \"tar\"-rör: %m\n" #. Give up -#: build.c:178 +#: build.c:162 #, c-format msgid "Failed to read spec file from %s\n" msgstr "Kunde inte läsa specfil från %s\n" -#: build.c:206 +#: build.c:190 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "Kunde inte byta namn på %s till %s: %m\n" -#: build.c:245 +#: build.c:229 #, c-format msgid "failed to stat %s: %m\n" msgstr "kunde inte ta status på %s: %m\n" -#: build.c:250 +#: build.c:234 #, c-format msgid "File %s is not a regular file.\n" msgstr "Filen %s är inte en vanlig fil.\n" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "Filen %s tycks inte vara en specfil.\n" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "Bygger målplattformar: %s\n" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "Bygger för målet %s\n" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "argumentet är inte ett RPM-paket\n" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "fel vid läsning av pakethuvud\n" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "kan inte återöppna lasten: %s\n" @@ -402,44 +397,44 @@ msgstr "--sign kan enbart användas vid pakettillverkning" msgid "exec failed\n" msgstr "exec misslyckades\n" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "inga paketfiler angivna för omtillverkning" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "inga specfiler angivna för tillverkning" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "inga tar-filer angivna för tillverkning" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "inga paket angivna för avinstallation" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "inga paket angivna för installation" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "inga parametrar angivna för fråga" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "inga parametrar angivna för verifiering" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "oväntade argument till --querytags " -#: rpmqv.c:1156 +#: rpmqv.c:1149 #, fuzzy msgid "no arguments given" msgstr "inga parametrar angivna för fråga" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 msgid "Unable to open temp file.\n" msgstr "Kan inte öppna temporär fil.\n" @@ -650,7 +645,7 @@ msgstr "Hittade ingen fil vid matchningen: %s\n" msgid "Could not open %%files file %s: %s\n" msgstr "Kunde inte öppna %%files-fil %s: %s\n" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "rad: %s\n" @@ -725,152 +720,152 @@ msgstr "getGidS: för många gid\n" msgid "Could not canonicalize hostname: %s\n" msgstr "Kunde inte kanonisera värdnamn: %s\n" -#: build/pack.c:81 +#: build/pack.c:79 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "skapande av arkiv misslyckades vid fil %s: %s\n" -#: build/pack.c:84 +#: build/pack.c:82 #, c-format msgid "create archive failed: %s\n" msgstr "skapande av arkiv misslyckades: %s\n" -#: build/pack.c:106 +#: build/pack.c:104 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "cpio_copy kunde inte skriva: %s\n" -#: build/pack.c:113 +#: build/pack.c:111 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "cpio_copy kunde inte läsa: %s\n" -#: build/pack.c:216 +#: build/pack.c:214 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "Kunde inte öppna PreIn-fil: %s\n" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "Kunde inte öppna PreUn-fil: %s\n" -#: build/pack.c:230 +#: build/pack.c:228 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "Kunde inte öppna PostIn-fil: %s\n" -#: build/pack.c:237 +#: build/pack.c:235 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "Kunde inte öppna PostUn-fil: %s\n" -#: build/pack.c:245 +#: build/pack.c:243 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "Kunde inte öppna VerifyScript-fil: %s\n" -#: build/pack.c:260 +#: build/pack.c:258 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "Kunde inte öppna Trigger-skriptfil: %s\n" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "readRPM: öppna %s: %s\n" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "readRPM: läs %s: %s\n" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: Fseek misslyckades: %s\n" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s är inte ett RPM-paket\n" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: läser huvud från %s\n" -#: build/pack.c:475 +#: build/pack.c:467 msgid "Unable to create immutable header region.\n" msgstr "Kan inte skapa oföränderlig huvudregion.\n" -#: build/pack.c:493 +#: build/pack.c:485 msgid "Unable to write temp header\n" msgstr "Kan inte skriva temporärhuvud\n" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "Felaktig CSA-data\n" -#: build/pack.c:536 +#: build/pack.c:528 msgid "Unable to write final header\n" msgstr "Kan inte skriva slutligt huvud\n" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "Genererar signatur: %d\n" -#: build/pack.c:567 +#: build/pack.c:559 msgid "Unable to reload signature header.\n" msgstr "Kan inte läsa om signaturhuvud.\n" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "Kunde inte öppna %s: %s\n" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunde inte skriva paket: %s\n" -#: build/pack.c:626 +#: build/pack.c:618 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "Kan inte läsa signaturen %s: %s\n" -#: build/pack.c:636 +#: build/pack.c:628 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "Kan inte läsa huvud från %s: %s\n" -#: build/pack.c:650 +#: build/pack.c:642 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "Kan inte skriva huvud till %s: %s\n" -#: build/pack.c:660 +#: build/pack.c:652 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "Kan inte läsa last från %s: %s\n" -#: build/pack.c:666 +#: build/pack.c:658 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "Kan inte skriva last till %s: %s\n" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "Kunde inte generera utfilnamn för paketet %s: %s\n" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "kan inte skapa %s: %s\n" @@ -1432,7 +1427,7 @@ msgid " failed - " msgstr " misslyckades - " #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -1441,65 +1436,85 @@ msgstr "" "\"B\"-beroendet behöver en epok (antar samma som \"A\")\n" "\tA %s\tB %s\n" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "JA" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "NEJ " -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, c-format +msgid "cannot open Packages database in %s\n" +msgstr "kan inte öppna paketdatabas i %s\n" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, fuzzy, c-format +msgid "package %s already added, ignoring\n" +msgstr "paket %s är redan installerat" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "%s: %-45s JA (lade till filer)\n" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "%s: %-45s JA (lade till tillhandahållande)\n" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-s (cachad)\n" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s JA (rpmlib tillhandahåller)\n" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s JA (db-filer)\n" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s JA (db-tillhandahållande)\n" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s JA (db-paket)\n" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NEJ\n" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) tillagt till beroendecachen.\n" @@ -1507,43 +1522,43 @@ msgstr "%s: (%s, %s) tillagt till beroendecachen.\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, 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:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "paket %s står i konflikt: %s\n" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "tar bort %s-%s-%s \"%s\" från tsort-relationer.\n" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "========== noterar alla relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== tsort:erar paket (ordning, #föregångare, #efterföljare, djup)\n" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "========== endast efterföljare (presentationsordning)\n" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "LOOP:\n" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "========== fortsätter med tsort ...\n" @@ -2279,65 +2294,65 @@ msgstr "kan inte skapa %%%s %s\n" msgid "cannot write to %%%s %s\n" msgstr "kan inte skriva till %%%s %s\n" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "källpaket förväntades, fann binärpaket\n" -#: lib/psm.c:1330 +#: lib/psm.c:1329 msgid "source package contains no .spec file\n" msgstr "källpaket innehåller ingen .spec-fil\n" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: kör (eventuellt) %s-skript\n" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" "körning av %s-skript från %s-%s-%s misslyckades, waitpid returnerade %s\n" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "körning av %s-skript från %s-%s-%s misslyckades, slutstatus %d\n" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s har %d filer, test = %d\n" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "%s: %s-skript misslyckades (%d), hoppar över %s-%s-%s\n" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "användare %s finns inte - använder root\n" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "grupp %s finns inte - använder root\n" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "uppackning av arkiv misslyckades%s%s: %s\n" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr " vid fil " -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s misslyckades på fil %s: %s\n" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, c-format msgid "%s failed: %s\n" msgstr "%s misslyckades: %s\n" @@ -2385,8 +2400,8 @@ msgstr "paketet har varken filägare eller id-listor\n" msgid "can't query %s: %s\n" msgstr "kan inte fråga %s: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "misslyckades med att öppna %s: %s\n" @@ -2400,7 +2415,7 @@ msgstr "fråga av %s misslyckades\n" msgid "old format source packages cannot be queried\n" msgstr "källpaket i gammalt format går inte att fråga om\n" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: läsning av paketlista misslyckades: %s\n" @@ -2459,7 +2474,7 @@ msgstr "paketpost nummer: %u\n" msgid "record %u could not be read\n" msgstr "post %u kunde inte läsas\n" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "paket %s är inte installerat\n" @@ -2535,58 +2550,53 @@ msgstr "Förbereder..." msgid "Preparing packages for installation..." msgstr "Förbereder paket för installation ..." -#: lib/rpminstall.c:228 -#, c-format -msgid "cannot open Packages database in %s\n" -msgstr "kan inte öppna paketdatabas i %s\n" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "Hämtar %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr " ... som %s\n" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "hoppar över %s - överföring misslyckades - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "paket %s är inte relokerbart\n" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "fel vid läsning från fil %s\n" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "filen %s behöver en nyare version av RPM\n" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "%s kan inte installeras\n" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "hittade %d käll- och %d binärpaket\n" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "ouppfyllda beroenden:\n" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "installerar binärpaket\n" @@ -2595,26 +2605,21 @@ msgstr "installerar binärpaket\n" msgid "cannot open file %s: %s\n" msgstr "kan inte öppna filen %s: %s\n" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "kan inte öppna %s/packages.rpm\n" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" anger flera paket\n" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "att ta bort dessa paket skulle göra sönder beroenden:\n" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "Installerar %s\n" @@ -2872,7 +2877,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "%s överhoppad på grund av missingok-flagga\n" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "hoppar över katalogen %s\n" @@ -3081,11 +3086,11 @@ msgstr "fel(%d) när post %s sparades i %s\n" msgid "error(%d) removing record %s from %s\n" msgstr "fel(%d) när post %s togs bort ur %s\n" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "ingen dbpath har satts\n" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" @@ -3094,114 +3099,114 @@ msgstr "" "i nytt format\n" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, c-format msgid "error(%d) counting packages\n" msgstr "fel(%d) när paket räknades\n" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "post nummer %u i databasen är felaktig -- hoppar över.\n" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "rpmdb: skadad huvudinstans #%u hämtad, hoppar över.\n" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: kan inte läsa huvud vid 0x%x\n" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "tar bort \"%s\" från %s-indexet.\n" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing %d entries from %s index.\n" msgstr "tar bort %d poster från %s-indexet.\n" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "fel(%d) vid allokering av ny paketinstans\n" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "lägger till \"%s\" till %s-indexet.\n" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, c-format msgid "adding %d entries to %s index.\n" msgstr "lägger till %d poster till %s-indexet.\n" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "tar bort %s efter lyckad db3-ombyggnad.\n" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "ingen dbpath har satts" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "bygger om databas %s till %s\n" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "tillfällig databas %s existerar redan\n" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, c-format msgid "creating directory %s\n" msgstr "skapar katalog %s\n" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, c-format msgid "creating directory %s: %s\n" msgstr "skapar katalog %s: %s\n" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "öppnar gammal databas med dbapi %d\n" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "öppnar ny databas med dbapi %d\n" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, c-format msgid "cannot add record originally at %u\n" msgstr "kan inte lägga till post ursprungligen vid %u\n" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "kunde inte ersätta gammal databas med ny databas!\n" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "byt ut filer i %s med filer från %s för att återställa" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, c-format msgid "removing directory %s\n" msgstr "tar bort katalog %s\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunde inte ta bort katalogen %s: %s\n" @@ -3413,6 +3418,12 @@ msgstr "url-port måste vara ett tal\n" msgid "failed to create %s: %s\n" msgstr "kunde inte skapa %s: %s\n" +#~ msgid "cannot open rpm database in %s\n" +#~ msgstr "kan inte öppna rpmdatabas i %s\n" + +#~ msgid "cannot open %s/packages.rpm\n" +#~ msgstr "kan inte öppna %s/packages.rpm\n" + #~ msgid "add a signature to a package" #~ msgstr "lägg till signatur till ett paket" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n" "Language-Team: Turkish <tr@li.org>\n" @@ -10,71 +10,66 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 0.9.2alpha\n" -#: build.c:37 -#, c-format -msgid "cannot open rpm database in %s\n" -msgstr "%s dizininde rpm veritabaný açýlamýyor\n" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "iþlem durdu, önce baðýmlý paketler kurulmalý:\n" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "%s spec dosyasý açýlamadý: %s\n" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "tar veriyolu açýlamadý: %m\n" #. Give up -#: build.c:178 +#: build.c:162 #, c-format msgid "Failed to read spec file from %s\n" msgstr "%s paketinden spec dosyasý okunamadý\n" -#: build.c:206 +#: build.c:190 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "%s %s olarak deðiþtirilemedi: %m\n" -#: build.c:245 +#: build.c:229 #, c-format msgid "failed to stat %s: %m\n" msgstr "%s durum bilgileri alýnamadý: %m\n" -#: build.c:250 +#: build.c:234 #, c-format msgid "File %s is not a regular file.\n" msgstr "%s bir normal bir dosya deðil.\n" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "%s bir spec dosyasý gibi görünmüyor.\n" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "Hedef platformlar derleniyor: %s\n" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "%s için derleniyor\n" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "argüman bir RPM paketi deðil\n" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "paketten baþlýk okunmasý sýrasýnda hata oluþtu\n" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "payload %s tekrar açýlamýyor\n" @@ -409,44 +404,44 @@ msgstr "--sign sadece paket oluþturulurken kullanýlabilir" msgid "exec failed\n" msgstr "icra baþarýsýz\n" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "yeniden oluþturmak için paket dosyalarý belirtilmemiþ" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "oluþturma için gerekli spec dosyasý belirtilmemiþ" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "oluþturma için gereken tar dosyalarý belirtilmemiþ" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "sistemden silinecek paket(ler) belirtilmedi" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "yüklenecek paket(ler) belirtilmedi" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "sorgulama için hiç argüman belirtilmedi" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "denetleme için hiç argüman belirtilmedi" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "--querytags ile beklenmeyen girdiler" -#: rpmqv.c:1156 +#: rpmqv.c:1149 #, fuzzy msgid "no arguments given" msgstr "sorgulama için hiç argüman belirtilmedi" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 msgid "Unable to open temp file.\n" msgstr "Geçici dosya açýlamadý.\n" @@ -657,7 +652,7 @@ msgstr "Dosya glob tarafýndan bulunamadý: %s\n" msgid "Could not open %%files file %s: %s\n" msgstr "%%files dosya %s dosyasýnda açýlamadý: %s\n" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "satýr: %s\n" @@ -732,156 +727,156 @@ msgstr "getGidS: çok fazla grup-kimliði\n" msgid "Could not canonicalize hostname: %s\n" msgstr "Böyle bir makina yok: %s\n" -#: build/pack.c:81 +#: build/pack.c:79 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "%s dosyasýnda arþiv oluþturulamadý: %s\n" -#: build/pack.c:84 +#: build/pack.c:82 #, c-format msgid "create archive failed: %s\n" msgstr "arþiv oluþturulamadý: %s\n" -#: build/pack.c:106 +#: build/pack.c:104 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "cpio_copy yazma hatasý:%s\n" -#: build/pack.c:113 +#: build/pack.c:111 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "cpio_copy okuma hatasý: %s\n" -#: build/pack.c:216 +#: build/pack.c:214 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "PreIn dosyasý açýlamadý: %s\n" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "PreUn dosyasý açýlamadý: %s\n" -#: build/pack.c:230 +#: build/pack.c:228 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "PostIn dosyasý açýlamadý: %s\n" -#: build/pack.c:237 +#: build/pack.c:235 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "PostUn dosyasý açýlamadý: %s\n" -#: build/pack.c:245 +#: build/pack.c:243 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "VerifyScript dosyasý açýlamadý: %s\n" -#: build/pack.c:260 +#: build/pack.c:258 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "Trigger betik dosyasý açýlamadý: %s\n" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "readRPM: %s açýlýrken: %s\n" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "readRPM: %s okunurken: %s\n" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "%s: Fseek baþarýsýz: %s\n" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "readRPM: %s bir RPM paketi deðil\n" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "readRPM: %s baþlýðý okunuyor\n" -#: build/pack.c:475 +#: build/pack.c:467 #, fuzzy msgid "Unable to create immutable header region.\n" msgstr "%s'den baþlýk okunamadý: %s\n" -#: build/pack.c:493 +#: build/pack.c:485 #, fuzzy msgid "Unable to write temp header\n" msgstr "%s'e baþlýk yazýlamadý: %s\n" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "CSA verisi geçersiz\n" -#: build/pack.c:536 +#: build/pack.c:528 #, fuzzy msgid "Unable to write final header\n" msgstr "%s'e baþlýk yazýlamadý: %s\n" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "Ýmza üretiliyor: %d\n" -#: build/pack.c:567 +#: build/pack.c:559 #, fuzzy msgid "Unable to reload signature header.\n" msgstr "%s'den baþlýk okunamadý: %s\n" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "paket yazýlamadý: %s\n" -#: build/pack.c:626 +#: build/pack.c:618 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "sigtarget %s açýlamadý: %s\n" -#: build/pack.c:636 +#: build/pack.c:628 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "%s'den baþlýk okunamadý: %s\n" -#: build/pack.c:650 +#: build/pack.c:642 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "%s'e baþlýk yazýlamadý: %s\n" -#: build/pack.c:660 +#: build/pack.c:652 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "%s'den payload okunamadý: %s\n" -#: build/pack.c:666 +#: build/pack.c:658 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "%s'e payload yazýlamadý: %s\n" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "Yazýldý: %s\n" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "%s paket dosyasý için çýktý dosya adý üretilemedi: %s\n" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "%s dosyasý oluþturulamýyor: %s\n" @@ -1452,7 +1447,7 @@ msgid " failed - " msgstr " baþarýsýz - " #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, fuzzy, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -1461,65 +1456,85 @@ msgstr "" "\"B\" baðýmlýlýðý bir dönemsellik gerektirir (tabii ki \"A\" da)\n" "\tA %s\tB %s\n" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "EVET" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "HAYIR " -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, c-format +msgid "cannot open Packages database in %s\n" +msgstr "%s de Paket veritabaný açýlamadý\n" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, fuzzy, c-format +msgid "package %s already added, ignoring\n" +msgstr "%s zaten kurulu" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "%s: %-45s EVET (dosyalar eklendi)\n" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "%s: %-45s EVET (önlem eklendi)\n" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-s (arabellekli)\n" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s EVET (rpmrc saðlar)\n" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s EVET (rpmlib saðlar)\n" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s EVET (db dosyalarý)\n" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s EVET (db saðlar)\n" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s EVET (db paketi)\n" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s HAYIR\n" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) Baðýmlýlar alanýna eklendi.\n" @@ -1527,43 +1542,43 @@ msgstr "%s: (%s, %s) Baðýmlýlar alanýna eklendi.\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, 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:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "%s paketi çeliþiyor: %s\n" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%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:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "========== tsort baðýntýlarý kaydediliyor\n" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== paketler tsort'lanýyor (sýra, #öncüller, #ardýllar, derinlik)\n" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "========== sadece ardýllar (sunum sýrasý)\n" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "ÇEVRÝM:\n" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "========== tsort sürüyor ...\n" @@ -2303,64 +2318,64 @@ msgstr "%%%s dosyasý oluþturulamýyor: %s\n" msgid "cannot write to %%%s %s\n" msgstr "%%%s dosyasýna yazýlamaz %s\n" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "kaynak paketi gerekirken çalýþtýrýlabilir paketi bulundu\n" -#: lib/psm.c:1330 +#: lib/psm.c:1329 msgid "source package contains no .spec file\n" msgstr "kaynak paketi .spec dosyasý içermiyor\n" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: %s betiði çalýþtýrýlýyor (varsa)\n" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "%s betiðinin %s-%s-%s'den icrasý baþarýsýz, waitpid sonucu %s\n" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "%s betiðinin %s-%s-%s'den icrasý baþarýsýz, çýkýþta durum %d\n" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s %d dosya içeriyor, test = %d\n" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "%s: %s betiði baþarýsýz (%d), %s-%s-%s atlanýyor\n" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "kullanýcý %s yok - root kullanýlacak\n" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "grup %s yok - root kullanýlacak\n" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "arþiv paketi açýlýrken baþarýsýz%s%s: %s\n" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr " dosyada " -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s baþarýsýz\n" @@ -2408,8 +2423,8 @@ msgstr "paket ne dosya sahibi ne de kimlik listesi içeriyor\n" msgid "can't query %s: %s\n" msgstr "%s sorgulanamýyor: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "%s açýlamadý: %s\n" @@ -2423,7 +2438,7 @@ msgstr "%s 'nin sorgulamasý baþarýsýzlýkla sonuçlandý\n" msgid "old format source packages cannot be queried\n" msgstr "eski biçem kaynak paketleri sorgulanamaz\n" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: bildirge okuma baþarýsýz: %s\n" @@ -2482,7 +2497,7 @@ msgstr "paket kayýt numarasý: %u\n" msgid "record %u could not be read\n" msgstr "%u. kayýt okunamadý\n" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "%s paketi kurulu deðil\n" @@ -2558,58 +2573,53 @@ msgstr "Hazýrlanýyor..." msgid "Preparing packages for installation..." msgstr "Kurulacak paketler hazýrlanýyor..." -#: lib/rpminstall.c:228 -#, c-format -msgid "cannot open Packages database in %s\n" -msgstr "%s de Paket veritabaný açýlamadý\n" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "%s alýnýyor\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "... %s olarak\n" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s atlanýyor - aktarým baþarýsýz - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "%s paketi yeniden konumlandýrýlamaz\n" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "%s dosyasýndan okuma hatalý\n" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "%s dosyasý RPM'nin daha yeni bir sürümünü gerektiriyor\n" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "%s yüklenemedi\n" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "%d kaynak ve %d icra edilebilir paketi bulundu\n" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "baðýmlýlýklarda hata; gerekli paketler:\n" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "icra edilebilir paketleri kuruluyor\n" @@ -2618,26 +2628,21 @@ msgstr "icra edilebilir paketleri kuruluyor\n" msgid "cannot open file %s: %s\n" msgstr "%s dosyasý açýlamadý: %s\n" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "%s/packages.rpm açýlamýyor\n" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" birden fazla paketi tanýmlýyor\n" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "bu paketin silinmesi aþaðýdakilerin baðýmlýlýklarýný etkileyecektir:\n" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "%s kuruluyor\n" @@ -2893,7 +2898,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "missingok flamasýndan dolayý %s atlandý\n" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "%s dizini dýþlanýyor\n" @@ -3103,11 +3108,11 @@ msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n" msgid "error(%d) removing record %s from %s\n" msgstr "hata(%d) %s kaydýn %s dosyasýndan silinmesi\n" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "belirtilmiþ bir dbpath deðeri yok\n" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" @@ -3116,116 +3121,116 @@ msgstr "" "rebuilddb kullanýn\n" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, c-format msgid "error(%d) counting packages\n" msgstr "paketler taranýrken hata(%d)\n" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "veritabanýndaki %u. kayýt hatalý -- atlanýyor\n" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "rpmdb: bozuk baþlýk örneði #%u alýndý, atlanýyor.\n" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: 0x%x de baþlýk okunamadý\n" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "\"%s\" %s indeksinden siliniyor.\n" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing %d entries from %s index.\n" msgstr "%d girdi %s indeksinden siliniyor.\n" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "yeni paket örneðini tutma hatasý(%d)\n" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "\"%s\" %s indeksine ekleniyor.\n" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, c-format msgid "adding %d entries to %s index.\n" msgstr "%d girdi %s indeksine ekleniyor.\n" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "baþarýlý db3 yeniden oluþturma ertesinde %s kaldýrýlýyor\n" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "belirtilmiþ bir dbpath yok" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "%s veritabaný %s içinde yeniden oluþturuluyor\n" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "geçici veritabaný %s zaten mevcut\n" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, c-format msgid "creating directory %s\n" msgstr "%s dizini oluþturuluyor\n" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, c-format msgid "creating directory %s: %s\n" msgstr "%s dizini oluþturuluyor: %s\n" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "eski veritabaný dbapi %d ile açýlýyor\n" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "yeni veritabaný dbapi %d ile açýlýyor\n" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, c-format msgid "cannot add record originally at %u\n" msgstr "kayýt özgün olarak %u e eklenemedi\n" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "veritabaný yeniden oluþturulamadý: mevcut veritabaný deðiþmeden\n" "yerinde býrakýldý\n" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "eski veritabanýnýn yenisiyle deðiþtirilirmesi baþarýsýz!\n" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "kurtarmak için %s içindeki dosyalar %s deki dosyalarla deðiþtiriliyor" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, c-format msgid "removing directory %s\n" msgstr "%s dizini siliniyor\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s dizininin silinmesi baþarýsýz: %s\n" @@ -3437,6 +3442,12 @@ msgstr "url portu bir sayý olmalý\n" msgid "failed to create %s: %s\n" msgstr "%s oluþturulamadý: %s\n" +#~ msgid "cannot open rpm database in %s\n" +#~ msgstr "%s dizininde rpm veritabaný açýlamýyor\n" + +#~ msgid "cannot open %s/packages.rpm\n" +#~ msgstr "%s/packages.rpm açýlamýyor\n" + #~ msgid "add a signature to a package" #~ msgstr "pakete bir imza ekler" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -14,71 +14,66 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:37 -#, c-format -msgid "cannot open rpm database in %s\n" -msgstr "" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "" #. Give up -#: build.c:178 +#: build.c:162 #, c-format msgid "Failed to read spec file from %s\n" msgstr "" -#: build.c:206 +#: build.c:190 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "" -#: build.c:245 +#: build.c:229 #, c-format msgid "failed to stat %s: %m\n" msgstr "" -#: build.c:250 +#: build.c:234 #, c-format msgid "File %s is not a regular file.\n" msgstr "" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "" @@ -397,43 +392,43 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1156 +#: rpmqv.c:1149 msgid "no arguments given" msgstr "" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 msgid "Unable to open temp file.\n" msgstr "" @@ -641,7 +636,7 @@ msgstr "" msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" @@ -716,152 +711,152 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:79 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "" -#: build/pack.c:84 +#: build/pack.c:82 #, c-format msgid "create archive failed: %s\n" msgstr "" -#: build/pack.c:106 +#: build/pack.c:104 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "" -#: build/pack.c:113 +#: build/pack.c:111 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "" -#: build/pack.c:216 +#: build/pack.c:214 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "" -#: build/pack.c:230 +#: build/pack.c:228 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "" -#: build/pack.c:237 +#: build/pack.c:235 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "" -#: build/pack.c:245 +#: build/pack.c:243 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "" -#: build/pack.c:260 +#: build/pack.c:258 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:475 +#: build/pack.c:467 msgid "Unable to create immutable header region.\n" msgstr "" -#: build/pack.c:493 +#: build/pack.c:485 msgid "Unable to write temp header\n" msgstr "" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:536 +#: build/pack.c:528 msgid "Unable to write final header\n" msgstr "" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "" -#: build/pack.c:567 +#: build/pack.c:559 msgid "Unable to reload signature header.\n" msgstr "" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" -#: build/pack.c:626 +#: build/pack.c:618 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "" -#: build/pack.c:636 +#: build/pack.c:628 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "" -#: build/pack.c:650 +#: build/pack.c:642 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "" -#: build/pack.c:660 +#: build/pack.c:652 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "" -#: build/pack.c:666 +#: build/pack.c:658 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "" @@ -1416,72 +1411,92 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, c-format +msgid "cannot open Packages database in %s\n" +msgstr "" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, c-format +msgid "package %s already added, ignoring\n" +msgstr "" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1489,42 +1504,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2241,64 +2256,64 @@ msgstr "" msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1329 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr "" -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2346,8 +2361,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2361,7 +2376,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2420,7 +2435,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2496,58 +2511,53 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:228 -#, c-format -msgid "cannot open Packages database in %s\n" -msgstr "" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "" @@ -2556,26 +2566,21 @@ msgstr "" msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "" @@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3029,125 +3034,125 @@ msgstr "" msgid "error(%d) removing record %s from %s\n" msgstr "" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, c-format msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -14,71 +14,66 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:37 -#, c-format -msgid "cannot open rpm database in %s\n" -msgstr "" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "" #. Give up -#: build.c:178 +#: build.c:162 #, c-format msgid "Failed to read spec file from %s\n" msgstr "" -#: build.c:206 +#: build.c:190 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "" -#: build.c:245 +#: build.c:229 #, c-format msgid "failed to stat %s: %m\n" msgstr "" -#: build.c:250 +#: build.c:234 #, c-format msgid "File %s is not a regular file.\n" msgstr "" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "" @@ -397,43 +392,43 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1156 +#: rpmqv.c:1149 msgid "no arguments given" msgstr "" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 msgid "Unable to open temp file.\n" msgstr "" @@ -641,7 +636,7 @@ msgstr "" msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" @@ -716,152 +711,152 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:79 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "" -#: build/pack.c:84 +#: build/pack.c:82 #, c-format msgid "create archive failed: %s\n" msgstr "" -#: build/pack.c:106 +#: build/pack.c:104 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "" -#: build/pack.c:113 +#: build/pack.c:111 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "" -#: build/pack.c:216 +#: build/pack.c:214 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "" -#: build/pack.c:230 +#: build/pack.c:228 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "" -#: build/pack.c:237 +#: build/pack.c:235 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "" -#: build/pack.c:245 +#: build/pack.c:243 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "" -#: build/pack.c:260 +#: build/pack.c:258 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:475 +#: build/pack.c:467 msgid "Unable to create immutable header region.\n" msgstr "" -#: build/pack.c:493 +#: build/pack.c:485 msgid "Unable to write temp header\n" msgstr "" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:536 +#: build/pack.c:528 msgid "Unable to write final header\n" msgstr "" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "" -#: build/pack.c:567 +#: build/pack.c:559 msgid "Unable to reload signature header.\n" msgstr "" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" -#: build/pack.c:626 +#: build/pack.c:618 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "" -#: build/pack.c:636 +#: build/pack.c:628 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "" -#: build/pack.c:650 +#: build/pack.c:642 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "" -#: build/pack.c:660 +#: build/pack.c:652 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "" -#: build/pack.c:666 +#: build/pack.c:658 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "" @@ -1416,72 +1411,92 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, c-format +msgid "cannot open Packages database in %s\n" +msgstr "" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, c-format +msgid "package %s already added, ignoring\n" +msgstr "" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1489,42 +1504,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2241,64 +2256,64 @@ msgstr "" msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1329 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr "" -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2346,8 +2361,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2361,7 +2376,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2420,7 +2435,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2496,58 +2511,53 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:228 -#, c-format -msgid "cannot open Packages database in %s\n" -msgstr "" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "" @@ -2556,26 +2566,21 @@ msgstr "" msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "" @@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3029,125 +3034,125 @@ msgstr "" msgid "error(%d) removing record %s from %s\n" msgstr "" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, c-format msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -14,71 +14,66 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:37 -#, c-format -msgid "cannot open rpm database in %s\n" -msgstr "" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "" #. Give up -#: build.c:178 +#: build.c:162 #, c-format msgid "Failed to read spec file from %s\n" msgstr "" -#: build.c:206 +#: build.c:190 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "" -#: build.c:245 +#: build.c:229 #, c-format msgid "failed to stat %s: %m\n" msgstr "" -#: build.c:250 +#: build.c:234 #, c-format msgid "File %s is not a regular file.\n" msgstr "" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "" @@ -397,43 +392,43 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1156 +#: rpmqv.c:1149 msgid "no arguments given" msgstr "" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 msgid "Unable to open temp file.\n" msgstr "" @@ -641,7 +636,7 @@ msgstr "" msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" @@ -716,152 +711,152 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:79 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "" -#: build/pack.c:84 +#: build/pack.c:82 #, c-format msgid "create archive failed: %s\n" msgstr "" -#: build/pack.c:106 +#: build/pack.c:104 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "" -#: build/pack.c:113 +#: build/pack.c:111 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "" -#: build/pack.c:216 +#: build/pack.c:214 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "" -#: build/pack.c:230 +#: build/pack.c:228 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "" -#: build/pack.c:237 +#: build/pack.c:235 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "" -#: build/pack.c:245 +#: build/pack.c:243 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "" -#: build/pack.c:260 +#: build/pack.c:258 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:475 +#: build/pack.c:467 msgid "Unable to create immutable header region.\n" msgstr "" -#: build/pack.c:493 +#: build/pack.c:485 msgid "Unable to write temp header\n" msgstr "" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:536 +#: build/pack.c:528 msgid "Unable to write final header\n" msgstr "" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "" -#: build/pack.c:567 +#: build/pack.c:559 msgid "Unable to reload signature header.\n" msgstr "" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" -#: build/pack.c:626 +#: build/pack.c:618 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "" -#: build/pack.c:636 +#: build/pack.c:628 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "" -#: build/pack.c:650 +#: build/pack.c:642 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "" -#: build/pack.c:660 +#: build/pack.c:652 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "" -#: build/pack.c:666 +#: build/pack.c:658 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "" @@ -1416,72 +1411,92 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, c-format +msgid "cannot open Packages database in %s\n" +msgstr "" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, c-format +msgid "package %s already added, ignoring\n" +msgstr "" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1489,42 +1504,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2241,64 +2256,64 @@ msgstr "" msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1329 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr "" -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2346,8 +2361,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2361,7 +2376,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2420,7 +2435,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2496,58 +2511,53 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:228 -#, c-format -msgid "cannot open Packages database in %s\n" -msgstr "" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "" @@ -2556,26 +2566,21 @@ msgstr "" msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "" @@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3029,125 +3034,125 @@ msgstr "" msgid "error(%d) removing record %s from %s\n" msgstr "" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, c-format msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 285b4d05b..9935eb869 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-10-26 00:15-0400\n" +"POT-Creation-Date: 2001-10-27 15:50-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -14,71 +14,66 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:37 -#, c-format -msgid "cannot open rpm database in %s\n" -msgstr "" - -#: build.c:48 +#: build.c:36 msgid "failed build dependencies:\n" msgstr "" -#: build.c:81 +#: build.c:65 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "" -#: build.c:159 build.c:171 +#: build.c:143 build.c:155 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "" #. Give up -#: build.c:178 +#: build.c:162 #, c-format msgid "Failed to read spec file from %s\n" msgstr "" -#: build.c:206 +#: build.c:190 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "" -#: build.c:245 +#: build.c:229 #, c-format msgid "failed to stat %s: %m\n" msgstr "" -#: build.c:250 +#: build.c:234 #, c-format msgid "File %s is not a regular file.\n" msgstr "" -#: build.c:259 +#: build.c:243 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "" #. parse up the build operators -#: build.c:314 +#: build.c:301 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:329 +#: build.c:316 #, c-format msgid "Building for target %s\n" msgstr "" -#: rpm2cpio.c:55 +#: rpm2cpio.c:47 msgid "argument is not an RPM package\n" msgstr "" -#: rpm2cpio.c:61 +#: rpm2cpio.c:53 msgid "error reading header from package\n" msgstr "" -#: rpm2cpio.c:83 +#: rpm2cpio.c:75 #, c-format msgid "cannot re-open payload: %s\n" msgstr "" @@ -397,43 +392,43 @@ msgstr "" msgid "exec failed\n" msgstr "" -#: rpmqv.c:963 +#: rpmqv.c:961 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1038 +#: rpmqv.c:1031 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1040 +#: rpmqv.c:1033 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1059 +#: rpmqv.c:1052 msgid "no packages given for uninstall" msgstr "" -#: rpmqv.c:1070 +#: rpmqv.c:1063 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1118 +#: rpmqv.c:1111 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1132 +#: rpmqv.c:1125 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1140 +#: rpmqv.c:1133 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1156 +#: rpmqv.c:1149 msgid "no arguments given" msgstr "" -#: build/build.c:125 build/pack.c:487 +#: build/build.c:125 build/pack.c:479 msgid "Unable to open temp file.\n" msgstr "" @@ -641,7 +636,7 @@ msgstr "" msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1777 build/pack.c:148 +#: build/files.c:1777 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" @@ -716,152 +711,152 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:81 +#: build/pack.c:79 #, c-format msgid "create archive failed on file %s: %s\n" msgstr "" -#: build/pack.c:84 +#: build/pack.c:82 #, c-format msgid "create archive failed: %s\n" msgstr "" -#: build/pack.c:106 +#: build/pack.c:104 #, c-format msgid "cpio_copy write failed: %s\n" msgstr "" -#: build/pack.c:113 +#: build/pack.c:111 #, c-format msgid "cpio_copy read failed: %s\n" msgstr "" -#: build/pack.c:216 +#: build/pack.c:214 #, c-format msgid "Could not open PreIn file: %s\n" msgstr "" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "Could not open PreUn file: %s\n" msgstr "" -#: build/pack.c:230 +#: build/pack.c:228 #, c-format msgid "Could not open PostIn file: %s\n" msgstr "" -#: build/pack.c:237 +#: build/pack.c:235 #, c-format msgid "Could not open PostUn file: %s\n" msgstr "" -#: build/pack.c:245 +#: build/pack.c:243 #, c-format msgid "Could not open VerifyScript file: %s\n" msgstr "" -#: build/pack.c:260 +#: build/pack.c:258 #, c-format msgid "Could not open Trigger script file: %s\n" msgstr "" -#: build/pack.c:288 +#: build/pack.c:286 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:298 +#: build/pack.c:296 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:307 build/pack.c:529 +#: build/pack.c:305 build/pack.c:521 #, c-format msgid "%s: Fseek failed: %s\n" msgstr "" -#: build/pack.c:341 +#: build/pack.c:333 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:350 +#: build/pack.c:342 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:475 +#: build/pack.c:467 msgid "Unable to create immutable header region.\n" msgstr "" -#: build/pack.c:493 +#: build/pack.c:485 msgid "Unable to write temp header\n" msgstr "" -#: build/pack.c:501 +#: build/pack.c:493 msgid "Bad CSA data\n" msgstr "" -#: build/pack.c:536 +#: build/pack.c:528 msgid "Unable to write final header\n" msgstr "" -#: build/pack.c:554 +#: build/pack.c:546 #, c-format msgid "Generating signature: %d\n" msgstr "" -#: build/pack.c:567 +#: build/pack.c:559 msgid "Unable to reload signature header.\n" msgstr "" -#: build/pack.c:575 +#: build/pack.c:567 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:611 lib/psm.c:2153 +#: build/pack.c:603 lib/psm.c:2152 #, c-format msgid "Unable to write package: %s\n" msgstr "" -#: build/pack.c:626 +#: build/pack.c:618 #, c-format msgid "Unable to open sigtarget %s: %s\n" msgstr "" -#: build/pack.c:636 +#: build/pack.c:628 #, c-format msgid "Unable to read header from %s: %s\n" msgstr "" -#: build/pack.c:650 +#: build/pack.c:642 #, c-format msgid "Unable to write header to %s: %s\n" msgstr "" -#: build/pack.c:660 +#: build/pack.c:652 #, c-format msgid "Unable to read payload from %s: %s\n" msgstr "" -#: build/pack.c:666 +#: build/pack.c:658 #, c-format msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:691 lib/psm.c:2419 +#: build/pack.c:683 lib/psm.c:2418 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:758 +#: build/pack.c:750 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:775 +#: build/pack.c:767 #, c-format msgid "cannot create %s: %s\n" msgstr "" @@ -1416,72 +1411,92 @@ msgid " failed - " msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/depends.c:555 +#: lib/depends.c:668 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/depends.c:584 +#: lib/depends.c:697 #, c-format msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "YES" msgstr "" -#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383 +#: lib/depends.c:698 lib/depends.c:1462 lib/depends.c:1595 msgid "NO " msgstr "" -#: lib/depends.c:1044 +#: lib/depends.c:815 +#, c-format +msgid "cannot open Packages database in %s\n" +msgstr "" + +#: lib/depends.c:995 +#, c-format +msgid "newer package %s already added, skipping %s\n" +msgstr "" + +#: lib/depends.c:1000 +#, c-format +msgid "package %s already added, ignoring\n" +msgstr "" + +#: lib/depends.c:1005 +#, c-format +msgid "older package %s already added, replacing with %s\n" +msgstr "" + +#: lib/depends.c:1256 #, c-format msgid "%s: %-45s YES (added files)\n" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1367 #, c-format msgid "%s: %-45s YES (added provide)\n" msgstr "" -#: lib/depends.c:1249 +#: lib/depends.c:1461 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:1278 +#: lib/depends.c:1490 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:1295 +#: lib/depends.c:1507 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:1319 +#: lib/depends.c:1531 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:1332 +#: lib/depends.c:1544 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:1346 +#: lib/depends.c:1558 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:1362 +#: lib/depends.c:1574 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:1383 +#: lib/depends.c:1595 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1489,42 +1504,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1456 +#: lib/depends.c:1668 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1535 +#: lib/depends.c:1747 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1788 +#: lib/depends.c:2000 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1938 +#: lib/depends.c:2150 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1998 +#: lib/depends.c:2210 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:2048 +#: lib/depends.c:2260 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:2101 +#: lib/depends.c:2313 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:2131 +#: lib/depends.c:2343 msgid "========== continuing tsort ...\n" msgstr "" @@ -2241,64 +2256,64 @@ msgstr "" msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1217 +#: lib/psm.c:1216 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1329 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1436 +#: lib/psm.c:1435 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1604 +#: lib/psm.c:1603 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1611 +#: lib/psm.c:1610 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1958 +#: lib/psm.c:1957 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2075 +#: lib/psm.c:2074 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2190 +#: lib/psm.c:2189 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2199 +#: lib/psm.c:2198 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2240 +#: lib/psm.c:2239 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2241 +#: lib/psm.c:2240 msgid " on file " msgstr "" -#: lib/psm.c:2427 +#: lib/psm.c:2426 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2430 +#: lib/psm.c:2429 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2346,8 +2361,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463 -#: lib/rpminstall.c:838 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:329 lib/rpminstall.c:464 +#: lib/rpminstall.c:834 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2361,7 +2376,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:476 +#: lib/query.c:648 lib/rpminstall.c:477 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2420,7 +2435,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:624 +#: lib/query.c:854 lib/rpminstall.c:620 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2496,58 +2511,53 @@ msgstr "" msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:228 -#, c-format -msgid "cannot open Packages database in %s\n" -msgstr "" - -#: lib/rpminstall.c:285 +#: lib/rpminstall.c:279 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:295 +#: lib/rpminstall.c:289 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:299 +#: lib/rpminstall.c:293 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:389 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:437 +#: lib/rpminstall.c:438 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:443 +#: lib/rpminstall.c:444 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:455 lib/rpminstall.c:694 +#: lib/rpminstall.c:456 lib/rpminstall.c:690 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:491 +#: lib/rpminstall.c:492 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:507 +#: lib/rpminstall.c:508 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:528 +#: lib/rpminstall.c:529 msgid "installing binary packages\n" msgstr "" @@ -2556,26 +2566,21 @@ msgstr "" msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:611 -#, c-format -msgid "cannot open %s/packages.rpm\n" -msgstr "" - -#: lib/rpminstall.c:627 +#: lib/rpminstall.c:623 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:651 +#: lib/rpminstall.c:647 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:680 +#: lib/rpminstall.c:676 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:686 +#: lib/rpminstall.c:682 #, c-format msgid "Installing %s\n" msgstr "" @@ -2828,7 +2833,7 @@ msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:937 +#: lib/transaction.c:935 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3029,125 +3034,125 @@ msgstr "" msgid "error(%d) removing record %s from %s\n" msgstr "" -#: rpmdb/rpmdb.c:889 +#: rpmdb/rpmdb.c:892 msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:1028 +#: rpmdb/rpmdb.c:1034 msgid "" "old format database is present; use --rebuilddb to generate a new format " "database\n" msgstr "" #. error -#: rpmdb/rpmdb.c:1273 +#: rpmdb/rpmdb.c:1291 #, c-format msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2057 rpmdb/rpmdb.c:3310 +#: rpmdb/rpmdb.c:2068 rpmdb/rpmdb.c:3321 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2110 +#: rpmdb/rpmdb.c:2121 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2380 +#: rpmdb/rpmdb.c:2391 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2452 +#: rpmdb/rpmdb.c:2463 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2461 +#: rpmdb/rpmdb.c:2472 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2662 +#: rpmdb/rpmdb.c:2673 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2743 +#: rpmdb/rpmdb.c:2754 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2754 +#: rpmdb/rpmdb.c:2765 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3196 +#: rpmdb/rpmdb.c:3207 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3229 +#: rpmdb/rpmdb.c:3240 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3267 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3260 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3266 +#: rpmdb/rpmdb.c:3277 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3268 +#: rpmdb/rpmdb.c:3279 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3275 +#: rpmdb/rpmdb.c:3286 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3286 +#: rpmdb/rpmdb.c:3297 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:3361 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3368 +#: rpmdb/rpmdb.c:3379 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3376 +#: rpmdb/rpmdb.c:3387 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3378 +#: rpmdb/rpmdb.c:3389 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3388 +#: rpmdb/rpmdb.c:3399 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3401 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/python/rpmmodule.c b/python/rpmmodule.c index 8b3985f03..fa97a6fd6 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -17,6 +17,7 @@ #include "Python.h" #include "rpmio_internal.h" #include "rpmcli.h" /* XXX for rpmCheckSig */ +#include "depends.h" /* XXX for ts->rpmdb */ #include "legacy.h" #include "misc.h" #include "header_internal.h" @@ -1543,6 +1544,7 @@ static PyObject * rpmtransGetAttr(rpmtransObject * o, char * name) { static void rpmtransDealloc(PyObject * o) { rpmtransObject * trans = (void *) o; + trans->ts->rpmdb = NULL; /* XXX HACK: avoid rpmdb close/free */ rpmtransFree(trans->ts); if (trans->dbo) { Py_DECREF(trans->dbo); @@ -1619,9 +1621,10 @@ static PyObject * rpmtransCreate(PyObject * self, PyObject * args) { o = (void *) PyObject_NEW(rpmtransObject, &rpmtransType); Py_XINCREF(db); - o->dbo = db; + o->dbo = db; /* XXX DYING: separate refcounts is bad craziness */ o->scriptFd = NULL; - o->ts = rpmtransCreateSet(db ? db->db : NULL, rootPath); + o->ts = rpmtransCreateSet(NULL, rootPath); + o->ts->rpmdb = (db ? db->db : NULL); o->keyList = PyList_New(0); return (void *) o; @@ -533,4 +533,8 @@ fi - wire transactions through rpmcli signature modes. - wire transactions through rpmcli query/verify modes. - wire transactions through rpmcli install/erase modes. -- legacy signatures always checked on package read. +- legacy signatures always checked where possible on package read. +- wire transactions through rpmcli build modes. +- lazy rpmdb open/close through transaction methods (mostly anyways). +- no-brainer refcounts for rpmdb object. +- check added header against transaction set, replace if newer. diff --git a/rpm.spec.in b/rpm.spec.in index 3bf22b0d6..b7ab33c48 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -533,4 +533,8 @@ fi - wire transactions through rpmcli signature modes. - wire transactions through rpmcli query/verify modes. - wire transactions through rpmcli install/erase modes. -- legacy signatures always checked on package read. +- legacy signatures always checked where possible on package read. +- wire transactions through rpmcli build modes. +- lazy rpmdb open/close through transaction methods (mostly anyways). +- no-brainer refcounts for rpmdb object. +- check added header against transaction set, replace if newer. diff --git a/rpm2cpio.c b/rpm2cpio.c index 43025558e..73bbf804e 100644 --- a/rpm2cpio.c +++ b/rpm2cpio.c @@ -30,22 +30,14 @@ int main(int argc, char **argv) } fdo = fdDup(STDOUT_FILENO); -#ifdef DYING - rc = rpmReadPackageHeader(fdi, &h, NULL, NULL, NULL); -#else - { const char * rootDir = ""; - rpmdb db = NULL; - rpmTransactionSet ts = rpmtransCreateSet(db, rootDir); - - ts->need_payload = 1; + { rpmTransactionSet ts = rpmtransCreateSet(NULL, NULL); + /*@-mustmod@*/ /* LCL: segfault */ rc = rpmReadPackageFile(ts, fdi, "rpm2cpio", &h); /*@=mustmod@*/ - ts->need_payload = 0; ts = rpmtransFree(ts); } -#endif switch (rc) { case RPMRC_BADSIZE: diff --git a/rpmdb/db1.c b/rpmdb/db1.c index bfeaa9e04..57ea66721 100644 --- a/rpmdb/db1.c +++ b/rpmdb/db1.c @@ -516,7 +516,7 @@ static int db1close(/*@only@*/ dbiIndex dbi, /*@unused@*/ unsigned int flags) return rc; } -static int db1open(/*@keep@*/ rpmdb rpmdb, int rpmtag, +static int db1open(rpmdb rpmdb, int rpmtag, /*@out@*/ dbiIndex * dbip) /*@globals rpmGlobalMacroContext, fileSystem @*/ diff --git a/rpmdb/db3.c b/rpmdb/db3.c index 4739dd114..f35a16d51 100644 --- a/rpmdb/db3.c +++ b/rpmdb/db3.c @@ -801,7 +801,7 @@ exit: } /*@=moduncon@*/ -static int db3open(/*@keep@*/ rpmdb rpmdb, int rpmtag, dbiIndex * dbip) +static int db3open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip) /*@globals rpmGlobalMacroContext, fileSystem @*/ /*@modifies *dbip, fileSystem @*/ diff --git a/rpmdb/dbconfig.c b/rpmdb/dbconfig.c index 75d209901..83f3966f8 100644 --- a/rpmdb/dbconfig.c +++ b/rpmdb/dbconfig.c @@ -476,16 +476,16 @@ dbiIndex db3New(rpmdb rpmdb, int rpmtag) dbOpts = _free(dbOpts); /*@-assignexpose@*/ - *dbi = db3dbi; /* structure assignment */ +/*@i@*/ *dbi = db3dbi; /* structure assignment */ /*@=assignexpose@*/ memset(&db3dbi, 0, sizeof(db3dbi)); if (!(dbi->dbi_perms & 0600)) dbi->dbi_perms = 0644; dbi->dbi_mode = rpmdb->db_mode; - /*@-keeptrans@*/ - dbi->dbi_rpmdb = rpmdb; - /*@=keeptrans@*/ + /*@-assignexpose -newreftrans@*/ /* FIX: figger rpmdb/dbi refcounts */ +/*@i@*/ dbi->dbi_rpmdb = rpmdb; + /*@=assignexpose =newreftrans@*/ dbi->dbi_rpmtag = rpmtag; /* diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c index c94daab1b..c865861ec 100644 --- a/rpmdb/rpmdb.c +++ b/rpmdb/rpmdb.c @@ -817,7 +817,9 @@ int rpmdbClose(rpmdb db) int dbix; int rc = 0; - if (db == NULL) return 0; + if (db == NULL || --db->nrefs > 0) + return 0; + if (db->_dbi) for (dbix = db->db_ndbi; --dbix >= 0; ) { int xx; @@ -833,7 +835,7 @@ int rpmdbClose(rpmdb db) db->db_root = _free(db->db_root); db->db_home = _free(db->db_home); db->_dbi = _free(db->_dbi); - db = _free(db); + /*@-refcounttrans@*/ db = _free(db); /*@=refcounttrans@*/ return rc; } @@ -858,9 +860,8 @@ static /*@only@*/ /*@null@*/ rpmdb newRpmdb(/*@kept@*/ /*@null@*/ const char * root, /*@kept@*/ /*@null@*/ const char * home, int mode, int perms, int flags) - /*@globals _db_filter_dups, rpmGlobalMacroContext, - fileSystem @*/ - /*@modifies _db_filter_dups, rpmGlobalMacroContext, fileSystem @*/ + /*@globals _db_filter_dups, rpmGlobalMacroContext @*/ + /*@modifies _db_filter_dups, rpmGlobalMacroContext @*/ { rpmdb db = xcalloc(sizeof(*db), 1); const char * epfx = _DB_ERRPFX; @@ -875,6 +876,8 @@ rpmdb newRpmdb(/*@kept@*/ /*@null@*/ const char * root, *db = dbTemplate; /* structure assignment */ /*@=assignexpose@*/ + db->_dbi = NULL; + if (!(perms & 0600)) perms = 0644; /* XXX sanity */ if (mode >= 0) db->db_mode = mode; @@ -887,7 +890,9 @@ rpmdb newRpmdb(/*@kept@*/ /*@null@*/ const char * root, /*@=nullpass@*/ if (!(db->db_home && db->db_home[0] != '%')) { rpmError(RPMERR_DBOPEN, _("no dbpath has been set\n")); - (void) rpmdbClose(db); + db->db_root = _free(db->db_root); + db->db_home = _free(db->db_home); + db = _free(db); /*@-globstate@*/ return NULL; /*@=globstate@*/ } /*@-nullpass@*/ @@ -897,6 +902,7 @@ rpmdb newRpmdb(/*@kept@*/ /*@null@*/ const char * root, db->db_filter_dups = _db_filter_dups; db->db_ndbi = dbiTagsMax; db->_dbi = xcalloc(db->db_ndbi, sizeof(*db->_dbi)); + db->nrefs = 1; /*@-globstate@*/ return db; /*@=globstate@*/ } /*@=mods@*/ @@ -1048,6 +1054,18 @@ exit: return rc; } +rpmdb rpmdbLink(rpmdb db) +{ + db->nrefs++; + /*@-refcounttrans@*/ return db; /*@=refcounttrans@*/ +} + +rpmdb rpmdbUnlink(rpmdb db) +{ + db->nrefs--; + return NULL; +} + /* XXX python/rpmmodule.c */ /*@-globs@*/ /* FIX: rpmGlobalMacroContext not in <rpmlib.h> */ int rpmdbOpen (const char * prefix, rpmdb *dbp, int mode, int perms) @@ -1517,7 +1535,7 @@ typedef struct miRE_s { struct _rpmdbMatchIterator { /*@only@*/ const void * mi_keyp; size_t mi_keylen; -/*@kept@*/ rpmdb mi_rpmdb; +/*@refcounted@*/ rpmdb mi_db; int mi_rpmtag; dbiIndexSet mi_set; DBC * mi_dbc; @@ -1547,7 +1565,7 @@ rpmdbMatchIterator rpmdbFreeIterator(rpmdbMatchIterator mi) if (mi == NULL) return mi; - dbi = dbiOpen(mi->mi_rpmdb, RPMDBI_PACKAGES, 0); + dbi = dbiOpen(mi->mi_db, RPMDBI_PACKAGES, 0); /*@-branchstate@*/ if (mi->mi_h) { if (dbi && mi->mi_dbc && mi->mi_modified && mi->mi_prevoffset) { @@ -1584,18 +1602,11 @@ rpmdbMatchIterator rpmdbFreeIterator(rpmdbMatchIterator mi) mi->mi_dbc = NULL; mi->mi_set = dbiFreeIndexSet(mi->mi_set); mi->mi_keyp = _free(mi->mi_keyp); + mi->mi_db = rpmdbUnlink(mi->mi_db); mi = _free(mi); return mi; } -rpmdb rpmdbGetIteratorRpmDB(rpmdbMatchIterator mi) { - if (mi == NULL) - return NULL; - /*@-retexpose -retalias@*/ - return mi->mi_rpmdb; - /*@=retexpose =retalias@*/ -} - unsigned int rpmdbGetIteratorOffset(rpmdbMatchIterator mi) { if (mi == NULL) return 0; @@ -2023,7 +2034,7 @@ Header rpmdbNextIterator(rpmdbMatchIterator mi) if (mi == NULL) return NULL; - dbi = dbiOpen(mi->mi_rpmdb, RPMDBI_PACKAGES, 0); + dbi = dbiOpen(mi->mi_db, RPMDBI_PACKAGES, 0); if (dbi == NULL) return NULL; @@ -2163,7 +2174,7 @@ static int rpmdbGrowIterator(/*@null@*/ rpmdbMatchIterator mi, if (!(mi && keyp)) return 1; - dbi = dbiOpen(mi->mi_rpmdb, mi->mi_rpmtag, 0); + dbi = dbiOpen(mi->mi_db, mi->mi_rpmtag, 0); if (dbi == NULL) return 1; @@ -2294,7 +2305,7 @@ fprintf(stderr, "*** RMW %s %p\n", tagName(rpmtag), dbi->dbi_rmw); mi->mi_keylen = keylen; /*@-assignexpose@*/ - mi->mi_rpmdb = db; + mi->mi_db = rpmdbLink(db); /*@=assignexpose@*/ mi->mi_rpmtag = rpmtag; diff --git a/rpmdb/rpmdb.h b/rpmdb/rpmdb.h index 25875023a..d6fccff68 100644 --- a/rpmdb/rpmdb.h +++ b/rpmdb/rpmdb.h @@ -31,19 +31,6 @@ struct _dbiIndexItem { unsigned int dbNum; /*!< database index */ }; -#ifdef DYING -/** \ingroup dbi - * A single item in an index database (i.e. the "data saved"). - */ -struct _dbiIR { -/*@unused@*/ unsigned int recOffset; /*!< byte offset of header in db */ -/*@unused@*/ unsigned int fileNumber; /*!< file array index */ -}; -/*@-typeuse@*/ -typedef struct _dbiIR * DBIR_t; -/*@=typeuse@*/ -#endif /* DYING */ - /** \ingroup dbi * Items retrieved from the index database. */ @@ -299,7 +286,7 @@ struct _dbiIndex { /* queue access parameters */ unsigned int dbi_q_extentsize; -/*@kept@*/ rpmdb dbi_rpmdb; +/*@refcounted@*/ rpmdb dbi_rpmdb; rpmTag dbi_rpmtag; /*!< rpm tag used for index */ int dbi_jlen; /*!< size of join key */ @@ -341,6 +328,8 @@ struct rpmdb_s { /*@modifies *ptr @*/; int db_ndbi; /*!< No. of tag indices. */ dbiIndex * _dbi; /*!< Tag indices. */ + +/*@refs@*/ int nrefs; /*!< Reference count. */ }; /* for RPM's internal use only */ @@ -364,7 +353,7 @@ extern "C" { * Return new configured index database handle instance. * @param rpmdb rpm database */ -/*@only@*/ /*@null@*/ dbiIndex db3New(/*@keep@*/ rpmdb rpmdb, int rpmtag) +/*@only@*/ /*@null@*/ dbiIndex db3New(rpmdb rpmdb, int rpmtag) /*@globals rpmGlobalMacroContext @*/ /*@modifies rpmGlobalMacroContext @*/; diff --git a/rpmio/rpmmessages.h b/rpmio/rpmmessages.h index 029f9167d..b9efff8fd 100644 --- a/rpmio/rpmmessages.h +++ b/rpmio/rpmmessages.h @@ -56,8 +56,7 @@ extern "C" { /** */ -typedef /*@only@*/ /*@null@*/ - void * (*rpmCallbackFunction) +typedef void * (*rpmCallbackFunction) (/*@null@*/ const void * h, const rpmCallbackType what, const unsigned long amount, @@ -952,9 +952,7 @@ int main(int argc, const char ** argv) case MODE_REBUILD: case MODE_RECOMPILE: { const char * pkg; - const char * rootDir = ""; - rpmdb db = NULL; - rpmTransactionSet ts = NULL; + rpmTransactionSet ts; while (!rpmIsVerbose()) rpmIncreaseVerbosity(); @@ -971,12 +969,7 @@ int main(int argc, const char ** argv) ba->buildAmount |= RPMBUILD_RMBUILD; } - if (rpmdbOpen(rootDir, &db, O_RDONLY, 0644)) { - ec = 1; - break; - } - ts = rpmtransCreateSet(db, rootDir); - + ts = rpmtransCreateSet(NULL, NULL); while ((pkg = poptGetArg(optCon))) { const char * specFile = NULL; @@ -993,8 +986,8 @@ int main(int argc, const char ** argv) if (ec) /*@loopbreak@*/ break; } - ts = rpmtransFree(ts); + } break; case MODE_BUILD: diff --git a/tools/rpmsort.c b/tools/rpmsort.c index af4fc66ef..b33bdd6b5 100644 --- a/tools/rpmsort.c +++ b/tools/rpmsort.c @@ -32,7 +32,6 @@ static int do_tsort(const char *fileArgv[]) { const char * rootdir = "/"; - rpmdb rpmdb = NULL; rpmTransactionSet ts = NULL; const char ** pkgURL = NULL; char * pkgState = NULL; @@ -53,17 +52,17 @@ do_tsort(const char *fileArgv[]) if (fileArgv == NULL) return 0; - rc = rpmdbOpen(rootdir, &rpmdb, O_RDONLY, 0644); + ts = rpmtransCreateSet(NULL, NULL); + if (!noChainsaw) + ts->transFlags = RPMTRANS_FLAG_CHAINSAW; + + rc = rpmtsOpenDB(ts, O_RDONLY); if (rc) { rpmMessage(RPMMESS_ERROR, _("cannot open Packages database\n")); rc = -1; goto exit; } - ts = rpmtransCreateSet(rpmdb, rootdir); - if (!noChainsaw) - ts->transFlags = RPMTRANS_FLAG_CHAINSAW; - /* Load all the available packages. */ if (!(noDeps || noAvailable)) { rpmdbMatchIterator mi = NULL; @@ -262,14 +261,14 @@ restart: rc = 0; exit: - if (ts) rpmtransFree(ts); for (i = 0; i < numPkgs; i++) { pkgURL[i] = _free(pkgURL[i]); } pkgState = _free(pkgState); pkgURL = _free(pkgURL); argv = _free(argv); - if (rpmdb) rpmdbClose(rpmdb); + + ts = rpmtransFree(ts); return rc; } |