From 9ea554f799af5914cee5c34c82750a7f0918d30a Mon Sep 17 00:00:00 2001 From: jbj Date: Tue, 30 Oct 2001 18:00:21 +0000 Subject: [PATCH] - transaction.c: cleanly uncouple availablePackage from TFI_t. CVS patchset: 5142 CVS date: 2001/10/30 18:00:21 --- CHANGES | 1 + lib/depends.c | 7 +- lib/depends.h | 9 +++ lib/problems.c | 56 ++------------ lib/psm.c | 104 ++++++++++++++++---------- lib/psm.h | 59 +++++++++++---- lib/rpmal.c | 94 ++++++++++++++++++----- lib/rpmal.h | 82 ++++++++++++++++++--- lib/rpmlib.h | 11 +-- lib/transaction.c | 213 ++++++++++++++++++++++++++++++----------------------- po/cs.po | 124 +++++++++++++++---------------- po/da.po | 124 +++++++++++++++---------------- po/de.po | 124 +++++++++++++++---------------- po/en_RN.po | 124 +++++++++++++++---------------- po/es.po | 124 +++++++++++++++---------------- po/eu_ES.po | 124 +++++++++++++++---------------- po/fi.po | 124 +++++++++++++++---------------- po/fr.po | 124 +++++++++++++++---------------- po/gl.po | 124 +++++++++++++++---------------- po/hu.po | 124 +++++++++++++++---------------- po/id.po | 124 +++++++++++++++---------------- po/is.po | 124 +++++++++++++++---------------- po/it.po | 124 +++++++++++++++---------------- po/ja.po | 124 +++++++++++++++---------------- po/ko.po | 124 +++++++++++++++---------------- po/no.po | 124 +++++++++++++++---------------- po/pl.po | 124 +++++++++++++++---------------- po/pt.po | 124 +++++++++++++++---------------- po/pt_BR.po | 124 +++++++++++++++---------------- po/ro.po | 124 +++++++++++++++---------------- po/rpm.pot | 124 +++++++++++++++---------------- po/ru.po | 124 +++++++++++++++---------------- po/sk.po | 124 +++++++++++++++---------------- po/sl.po | 126 +++++++++++++++---------------- po/sr.po | 124 +++++++++++++++---------------- po/sv.po | 124 +++++++++++++++---------------- po/tr.po | 124 +++++++++++++++---------------- po/uk.po | 124 +++++++++++++++---------------- po/wa.po | 124 +++++++++++++++---------------- po/zh.po | 124 +++++++++++++++---------------- po/zh_CN.GB2312.po | 124 +++++++++++++++---------------- rpm.spec | 1 + rpm.spec.in | 1 + 43 files changed, 2331 insertions(+), 2153 deletions(-) diff --git a/CHANGES b/CHANGES index 9e2f49b..b9a6030 100644 --- a/CHANGES +++ b/CHANGES @@ -33,6 +33,7 @@ - dump the header early in transaction, recreate fi before installing. - start hiding availablePackage data/methods in rpmal.c/rpmal.h. - add some dinky availablePackage methods. + - transaction.c: cleanly uncouple availablePackage from TFI_t. 4.0.3 -> 4.0.4: diff --git a/lib/depends.c b/lib/depends.c index 9cbb651..865a771 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -500,8 +500,7 @@ 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 * hGetNVR(Header h, const char ** np ) { const char * NVR, * n, * v, * r; char * t; @@ -524,7 +523,7 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd, HGE_t hge = (HGE_t)headerGetEntryMinMemory; HFD_t hfd = headerFreeData; const char * name = NULL; - const char * addNVR = hNVRstr(h, &name); + const char * addNVR = hGetNVR(h, &name); const char * pkgNVR = NULL; rpmTagType ont, ovt; availablePackage p; @@ -548,7 +547,7 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd, if (strcmp(p->name, name)) continue; rc = rpmVersionCompare(p->h, h); - pkgNVR = hNVRstr(p->h, NULL); + pkgNVR = hGetNVR(p->h, NULL); if (rc > 0) { rpmMessage(RPMMESS_WARNING, _("newer package %s already added, skipping %s\n"), diff --git a/lib/depends.h b/lib/depends.h index bcdd8e6..d978d42 100644 --- a/lib/depends.h +++ b/lib/depends.h @@ -116,6 +116,15 @@ struct problemsSet_s { extern "C" { #endif +/** + * Return (malloc'd) header name-version-release string. + * @param h header + * @retval np name tag value + * @return name-version-release string + */ +/*@only@*/ const char * hGetNVR(Header h, /*@out@*/ const char ** np ) + /*@modifies *np @*/; + /** \ingroup rpmdep * Compare package name-version-release from header with dependency, looking * for overlap. diff --git a/lib/problems.c b/lib/problems.c index 3faf56a..8d917df 100644 --- a/lib/problems.c +++ b/lib/problems.c @@ -11,15 +11,9 @@ #include "misc.h" #include "debug.h" -/*@access Header@*/ /*@access rpmProblem@*/ /*@access rpmProblemSet@*/ /*@access rpmDependencyConflict@*/ -/*@access rpmTransactionSet@*/ /* XXX ts->addedPackages */ - -#if 0 -/*@access availablePackage@*/ -#endif rpmProblemSet rpmProblemSetCreate(void) { @@ -48,11 +42,10 @@ void rpmProblemSetFree(rpmProblemSet tsprobs) tsprobs = _free(tsprobs); } -void rpmProblemSetAppend(const rpmTransactionSet ts, - rpmProblemSet tsprobs, rpmProblemType type, - const availablePackage alp, +void rpmProblemSetAppend(rpmProblemSet tsprobs, rpmProblemType type, + const char * pkgNEVR, const void * key, const char * dn, const char * bn, - Header altH, unsigned long ulong1) + const char * altNEVR, unsigned long ulong1) { rpmProblem p; char *t; @@ -69,22 +62,14 @@ void rpmProblemSetAppend(const rpmTransactionSet ts, p = tsprobs->probs + tsprobs->numProblems; tsprobs->numProblems++; memset(p, 0, sizeof(*p)); + p->type = type; -#ifdef DYING - /*@-assignexpose@*/ - p->key = alp->key; - /*@=assignexpose@*/ -#else - p->key = alGetKey(ts->addedPackages, alGetPkgIndex(ts->addedPackages, alp)); -#endif + p->key = key; p->ulong1 = ulong1; p->ignoreProblem = 0; p->str1 = NULL; -#ifdef DYING - p->h = NULL; -#endif p->pkgNEVR = NULL; p->altNEVR = NULL; @@ -96,36 +81,9 @@ void rpmProblemSetAppend(const rpmTransactionSet ts, if (bn != NULL) t = stpcpy(t, bn); } - if (alp != NULL) { -#ifdef DYING - p->h = headerLink(alp->h); -#endif -#ifdef DYING - t = xcalloc(1, strlen(alp->name) + - strlen(alp->version) + - strlen(alp->release) + sizeof("--")); - p->pkgNEVR = t; - t = stpcpy(t, alp->name); - t = stpcpy(t, "-"); - t = stpcpy(t, alp->version); - t = stpcpy(t, "-"); - t = stpcpy(t, alp->release); -#else - p->pkgNEVR = alGetPkgNVR(ts->addedPackages, alp); -#endif - } + p->pkgNEVR = pkgNEVR; + p->altNEVR = altNEVR; - if (altH != NULL) { - const char * n, * v, * r; - (void) headerNVR(altH, &n, &v, &r); - t = xcalloc(1, strlen(n) + strlen(v) + strlen(r) + sizeof("--")); - p->altNEVR = t; - t = stpcpy(t, n); - t = stpcpy(t, "-"); - t = stpcpy(t, v); - t = stpcpy(t, "-"); - t = stpcpy(t, r); - } } #define XSTRCMP(a, b) ((!(a) && !(b)) || ((a) && (b) && !strcmp((a), (b)))) diff --git a/lib/psm.c b/lib/psm.c index fc8de24..0e4d24c 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -21,18 +21,15 @@ /*@unchecked@*/ int _fi_debug = 0; -/*@access Header @*/ /* compared with NULL */ -/*@access rpmdbMatchIterator @*/ /* compared with NULL */ -/*@access FSM_t @*/ /* compared with NULL */ -/*@access FD_t @*/ /* compared with NULL */ -/*@access rpmdb @*/ /* compared with NULL */ +/*@access Header@*/ /* compared with NULL */ +/*@access rpmdbMatchIterator@*/ /* compared with NULL */ +/*@access FSM_t@*/ /* compared with NULL */ +/*@access FD_t@*/ /* compared with NULL */ +/*@access rpmdb@*/ /* compared with NULL */ -/*@access rpmTransactionSet @*/ -/*@access TFI_t @*/ -/*@access PSM_t @*/ - -/*@access availablePackage@*/ -/*@access availableList@*/ +/*@access rpmTransactionSet@*/ +/*@access TFI_t@*/ +/*@access PSM_t@*/ /*@-redecl -declundef -exportheadervar@*/ /*@unchecked@*/ @@ -75,6 +72,27 @@ int rpmVersionCompare(Header first, Header second) return rpmvercmp(one, two); } +char * fiGetNVR(const TFI_t fi) +{ + char * pkgNVR; + char * t; + + if (fi == NULL) + return xstrdup("--"); + + t = xcalloc(1, (fi->name != NULL ? strlen(fi->name) : 0) + + (fi->version != NULL ? strlen(fi->version) : 0) + + (fi->release != NULL ? strlen(fi->release) : 0) + + sizeof("--")); + pkgNVR = t; + if (fi->name != NULL) t = stpcpy(t, fi->name); + t = stpcpy(t, "-"); + if (fi->version != NULL) t = stpcpy(t, fi->version); + t = stpcpy(t, "-"); + if (fi->release != NULL) t = stpcpy(t, fi->release); + return pkgNVR; +} + /** */ static /*@observer@*/ const char *const ftstring (fileTypes ft) @@ -107,7 +125,6 @@ fileTypes whatis(uint_16 mode) #define alloca_strdup(_s) strcpy(alloca(strlen(_s)+1), (_s)) Header relocateFileList(const rpmTransactionSet ts, TFI_t fi, - availablePackage alp, Header origH, fileAction * actions) { HGE_t hge = fi->hge; @@ -116,7 +133,6 @@ Header relocateFileList(const rpmTransactionSet ts, TFI_t fi, HFD_t hfd = (fi->hfd ? fi->hfd : headerFreeData); static int _printed = 0; int allowBadRelocate = (ts->ignoreSet & RPMPROB_FILTER_FORCERELOCATE); - rpmRelocation * rawRelocations = alp->relocs; rpmRelocation * relocations = NULL; int numRelocations; const char ** validRelocations; @@ -145,9 +161,9 @@ Header relocateFileList(const rpmTransactionSet ts, TFI_t fi, numValid = 0; numRelocations = 0; - if (rawRelocations) - while (rawRelocations[numRelocations].newPath || - rawRelocations[numRelocations].oldPath) + if (fi->relocs) + while (fi->relocs[numRelocations].newPath || + fi->relocs[numRelocations].oldPath) numRelocations++; /* @@ -156,7 +172,7 @@ Header relocateFileList(const rpmTransactionSet ts, TFI_t fi, * should be added, but, since relocateFileList() can be called more * than once for the same header, don't bother if already present. */ - if (rawRelocations == NULL || numRelocations == 0) { + if (fi->relocs == NULL || numRelocations == 0) { if (numValid) { if (!headerIsEntry(origH, RPMTAG_INSTPREFIXES)) xx = hae(origH, RPMTAG_INSTPREFIXES, @@ -179,11 +195,11 @@ Header relocateFileList(const rpmTransactionSet ts, TFI_t fi, * Default relocations (oldPath == NULL) are handled in the UI, * not rpmlib. */ - if (rawRelocations[i].oldPath == NULL) continue; /* XXX can't happen */ + if (fi->relocs[i].oldPath == NULL) continue; /* XXX can't happen */ /* FIXME: Trailing /'s will confuse us greatly. Internal ones will too, but those are more trouble to fix up. :-( */ - t = alloca_strdup(rawRelocations[i].oldPath); + t = alloca_strdup(fi->relocs[i].oldPath); /*@-branchstate@*/ relocations[i].oldPath = (t[0] == '/' && t[1] == '\0') ? t @@ -191,10 +207,10 @@ Header relocateFileList(const rpmTransactionSet ts, TFI_t fi, /*@=branchstate@*/ /* An old path w/o a new path is valid, and indicates exclusion */ - if (rawRelocations[i].newPath) { + if (fi->relocs[i].newPath) { int del; - t = alloca_strdup(rawRelocations[i].newPath); + t = alloca_strdup(fi->relocs[i].newPath); /*@-branchstate@*/ relocations[i].newPath = (t[0] == '/' && t[1] == '\0') ? t @@ -207,9 +223,11 @@ Header relocateFileList(const rpmTransactionSet ts, TFI_t fi, if (!strcmp(validRelocations[j], relocations[i].oldPath)) /*@innerbreak@*/ break; /* XXX actions check prevents problem from being appended twice. */ - if (j == numValid && !allowBadRelocate && actions) - rpmProblemSetAppend(ts, ts->probs, RPMPROB_BADRELOCATE, alp, - relocations[i].oldPath, NULL, NULL, 0); + if (j == numValid && !allowBadRelocate && actions) { + rpmProblemSetAppend(ts->probs, RPMPROB_BADRELOCATE, + fiGetNVR(fi), fi->key, + relocations[i].oldPath, NULL, NULL, 0); + } del = strlen(relocations[i].newPath) - strlen(relocations[i].oldPath); /*@=nullpass@*/ @@ -317,7 +335,7 @@ Header relocateFileList(const rpmTransactionSet ts, TFI_t fi, * If only adding libraries of different arch into an already * installed package, skip all other files. */ - if (alp->multiLib && !isFileMULTILIB((fFlags[i]))) { + if (fi->multiLib && !isFileMULTILIB((fFlags[i]))) { if (actions) { actions[i] = FA_SKIPMULTILIB; rpmMessage(RPMMESS_DEBUG, _("excluding multilib path %s%s\n"), @@ -527,9 +545,9 @@ Header relocateFileList(const rpmTransactionSet ts, TFI_t fi, const void * rpmfiGetKey(TFI_t fi) { - /*@-kepttrans -retexpose -usereleased@*/ -/*@i@*/ return (fi->ap != NULL ? fi->ap->key : NULL); - /*@=kepttrans =retexpose =usereleased@*/ +/*@-compdef -retexpose -usereleased@*/ + return fi->key; +/*@=compdef =retexpose =usereleased@*/ } TFI_t XrpmfiUnlink(TFI_t fi, const char * msg, const char * fn, unsigned ln) @@ -632,8 +650,8 @@ void loadFi(const rpmTransactionSet ts, TFI_t fi, Header h, int keep_header) /* 0 makes for noops */ fi->replacedSizes = xcalloc(fi->fc, sizeof(*fi->replacedSizes)); - if (ts != NULL && fi->ap != NULL && fi->h != NULL) - { Header foo = relocateFileList(ts, fi, fi->ap, fi->h, fi->actions); + if (ts != NULL && fi->h != NULL) + { Header foo = relocateFileList(ts, fi, fi->h, fi->actions); foo = headerFree(foo); } @@ -1177,19 +1195,28 @@ rpmRC rpmInstallSourcePackage(rpmTransactionSet ts, (void) rpmtransAddPackage(ts, h, fd, NULL, 0, NULL); + fi->type = TR_ADDED; + + fi->h = alGetHeader(ts->addedPackages, 0, 1); /* XXX can't happen */ - if ((fi->ap = alGetPkg(ts->addedPackages, 0)) == NULL) { + if (fi->h == NULL) { rc = RPMRC_FAIL; goto exit; } - fi->type = TR_ADDED; - loadFi(ts, fi, h, 1); + fi->multiLib = alGetMultiLib(ts->addedPackages, 0); + /*@-kepttrans@*/ + fi->key = alGetKey(ts->addedPackages, 0); + /*@=kepttrans@*/ + fi->relocs = alGetRelocs(ts->addedPackages, 0); + fi->fd = alGetFd(ts->addedPackages, 0); + + /* XXX header arg unused. */ + loadFi(ts, fi, fi->h, 1); hge = fi->hge; hfd = (fi->hfd ? fi->hfd : headerFreeData); h = headerFree(h); /* XXX reference held by transaction set */ - if (fi->h != NULL) /* XXX can't happen */ (void) rpmInstallLoadMacros(fi, fi->h); memset(psm, 0, sizeof(*psm)); @@ -2134,7 +2161,6 @@ assert(psm->mi == NULL); if (ts->transFlags & RPMTRANS_FLAG_TEST) break; if (psm->goal == PSM_PKGINSTALL) { - availablePackage alp = fi->ap; int i; if (fi->fc <= 0) break; @@ -2170,12 +2196,12 @@ assert(psm->mi == NULL); /* Retrieve type of payload compression. */ rc = psmStage(psm, PSM_RPMIO_FLAGS); - if (alp->fd == NULL) { /* XXX can't happen */ + if (fi->fd == NULL) { /* XXX can't happen */ rc = RPMRC_FAIL; break; } - /*@-nullpass@*/ /* LCL: alp->fd != NULL here. */ - psm->cfd = Fdopen(fdDup(Fileno(alp->fd)), psm->rpmio_flags); + /*@-nullpass@*/ /* LCL: fi->fd != NULL here. */ + psm->cfd = Fdopen(fdDup(Fileno(fi->fd)), psm->rpmio_flags); /*@=nullpass@*/ if (psm->cfd == NULL) { /* XXX can't happen */ rc = RPMRC_FAIL; @@ -2429,7 +2455,7 @@ assert(psm->mi == NULL); if (ts && ts->notify) { /*@-noeffectuncon @*/ /* FIX: check rc */ (void) ts->notify(fi->h, psm->what, psm->amount, psm->total, - (fi->ap ? fi->ap->key : NULL), ts->notifyData); + fi->key, ts->notifyData); /*@=noeffectuncon @*/ } break; diff --git a/lib/psm.h b/lib/psm.h index eebe504..a485af9 100644 --- a/lib/psm.h +++ b/lib/psm.h @@ -26,6 +26,38 @@ struct sharedFileInfo { /** */ struct transactionFileInfo_s { +/*@null@*/ Header h; /*!< Package header */ + +/*@owned@*/ const char * name; /*!< Name: tag (malloc'd). */ +/*@owned@*/ const char * version; /*!< Version: tag (malloc'd). */ +/*@owned@*/ const char * release; /*!< Release: tag (malloc'd). */ + +#ifdef NOTYET +/*@owned@*/ const char ** provides; /*!< Provides: name strings. */ +/*@owned@*/ const char ** providesEVR; /*!< Provides: [epoch:]version[-release] strings. */ +/*@dependent@*/ int * provideFlags; /*!< Provides: logical range qualifiers. */ +/*@owned@*//*@null@*/ const char ** requires; /*!< Requires: name strings. */ +/*@owned@*//*@null@*/ const char ** requiresEVR;/*!< Requires: [epoch:]version[-release] strings. */ +/*@dependent@*//*@null@*/ int * requireFlags; /*!< Requires: logical range qualifiers. */ +/*@owned@*//*@null@*/ const char ** baseNames; /*!< Header file basenames. */ +/*@dependent@*//*@null@*/ int_32 * epoch; /*!< Header epoch (if any). */ + int providesCount; /*!< No. of Provide:'s in header. */ + int requiresCount; /*!< No. of Require:'s in header. */ + int filesCount; /*!< No. of files in header. */ + int npreds; /*!< No. of predecessors. */ + int depth; /*!< Max. depth in dependency tree. */ + struct tsortInfo_s tsi; /*!< Dependency tsort data. */ +#endif + + uint_32 multiLib; /* MULTILIB */ +/*@null@*/ + const void * key; /*!< Package notify key. */ +/*@null@*/ + rpmRelocation * relocs; /*!< Package file relocations. */ +/*@null@*/ FD_t fd; /*!< Package file handle */ + +/*=============================*/ + /* for all packages */ enum rpmTransactionType type; fileAction action; /*!< File disposition default. */ @@ -36,10 +68,6 @@ struct transactionFileInfo_s { HME_t hme; /*!< Vector to headerModifyEntry() */ HRE_t hre; /*!< Vector to headerRemoveEntry() */ HFD_t hfd; /*!< Vector to headerFreeData() */ -/*@null@*/ Header h; /*!< Package header */ -/*@owned@*/ const char * name; -/*@owned@*/ const char * version; -/*@owned@*/ const char * release; int_32 epoch; uint_32 flags; /*!< File flag default. */ const uint_32 * fflags; /*!< File flag(s) (from header) */ @@ -77,19 +105,17 @@ struct transactionFileInfo_s { gid_t gid; /*@owned@*/ /*@null@*/ gid_t * fgids; /*!< File gid(s) */ int magic; + #define TFIMAGIC 0x09697923 /*@owned@*/ FSM_t fsm; /*!< File state machine data. */ int keep_header; /*!< Keep header? */ /*@refs@*/ int nrefs; /*!< Reference count. */ - /* these are for TR_ADDED packages */ -/*@dependent@*/ availablePackage ap; -/*@owned@*/ struct sharedFileInfo * replaced; -/*@owned@*/ uint_32 * replacedSizes; +/*@owned@*/ struct sharedFileInfo * replaced; /*!< (TR_ADDED) */ +/*@owned@*/ uint_32 * replacedSizes; /*!< (TR_ADDED) */ - /* for TR_REMOVED packages */ - unsigned int record; + unsigned int record; /*!< (TR_REMOVED) */ }; /** @@ -174,6 +200,15 @@ extern "C" { #endif /** + * Return (malloc'd) transaction element name-version-release string. + * @param fi transaction element file info + * @return name-version-release string + */ +/*@only@*/ /*@null@*/ +char * fiGetNVR(/*@null@*/const TFI_t fi) + /*@*/; + +/** * Return file type from mode_t. * @param mode file mode bits (from header) * @return file type @@ -186,15 +221,13 @@ fileTypes whatis(uint_16 mode) * @todo multilib file dispositions need to be checked. * @param ts transaction set * @param fi transaction element file info - * @param alp available package * @param origH package header * @param actions file dispositions * @return header with relocated files */ Header relocateFileList(const rpmTransactionSet ts, TFI_t fi, - availablePackage alp, Header origH, fileAction * actions) - /*@modifies ts, fi, alp, origH, actions @*/; + /*@modifies ts, fi, origH, actions @*/; /** * Load data from header into transaction file element info. diff --git a/lib/rpmal.c b/lib/rpmal.c index 3afabf9..d564bed 100644 --- a/lib/rpmal.c +++ b/lib/rpmal.c @@ -95,24 +95,12 @@ static void alFreeIndex(availableList al) } } -int alGetSize(availableList al) +int alGetSize(const availableList al) { return al->size; } -const void * alGetKey(availableList al, int pkgNum) -{ - const void * key = NULL; - if (al != NULL && pkgNum >= 0 && pkgNum < al->size) { - if (al->list != NULL) { - availablePackage alp = al->list + pkgNum; - key = alp->key; - } - } - return key; -} - -availablePackage alGetPkg(availableList al, int pkgNum) +availablePackage alGetPkg(const availableList al, int pkgNum) { availablePackage alp = NULL; if (al != NULL && pkgNum >= 0 && pkgNum < al->size) { @@ -126,7 +114,70 @@ fprintf(stderr, "*** alp[%d] %p\n", pkgNum, alp); return alp; } -int alGetPkgIndex(availableList al, availablePackage alp) +const void * alGetKey(const availableList al, int pkgNum) +{ + availablePackage alp = alGetPkg(al, pkgNum); + /*@-retexpose@*/ + return (alp != NULL ? alp->key : NULL); + /*@=retexpose@*/ +} + +int alGetMultiLib(const availableList al, int pkgNum) +{ + availablePackage alp = alGetPkg(al, pkgNum); + return (alp != NULL ? alp->multiLib : 0); +} + +int alGetFilesCount(const availableList al, int pkgNum) +{ + availablePackage alp = alGetPkg(al, pkgNum); + return (alp != NULL ? alp->filesCount : 0); +} + +Header alGetHeader(availableList al, int pkgNum, int unlink) +{ + availablePackage alp = alGetPkg(al, pkgNum); + Header h = NULL; + + if (alp != NULL && alp->h != NULL) { + h = headerLink(alp->h); + if (unlink) { + alp->h = headerFree(alp->h); + alp->h = NULL; + } + } + return h; +} + +rpmRelocation * alGetRelocs(const availableList al, int pkgNum) +{ + availablePackage alp = alGetPkg(al, pkgNum); + rpmRelocation * relocs = NULL; + + if (alp != NULL) { + relocs = alp->relocs; + alp->relocs = NULL; + } + return relocs; +} + +FD_t alGetFd(availableList al, int pkgNum) +{ + availablePackage alp = alGetPkg(al, pkgNum); + FD_t fd = NULL; + + if (alp != NULL) { + /*@-refcounttrans@*/ + fd = alp->fd; + alp->fd = NULL; + /*@=refcounttrans@*/ + } + /*@-refcounttrans@*/ +/*@i@*/ return fd; + /*@=refcounttrans@*/ +} + +int alGetPkgIndex(const availableList al, const availablePackage alp) { int pkgNum = -1; if (al != NULL) { @@ -141,9 +192,9 @@ fprintf(stderr, "*** alp %p[%d]\n", alp, pkgNum); return pkgNum; } -const char * alGetPkgNVR(availableList al, availablePackage alp) +char * alGetPkgNVR(const availableList al, const availablePackage alp) { - const char * pkgNVR = NULL; + char * pkgNVR = NULL; if (al != NULL) { if (al->list != NULL) @@ -163,6 +214,15 @@ const char * alGetPkgNVR(availableList al, availablePackage alp) return pkgNVR; } +void alProblemSetAppend(const availableList al, const availablePackage alp, + rpmProblemSet tsprobs, rpmProblemType type, + const char * dn, const char * bn, + const char * altNEVR, unsigned long ulong1) +{ + rpmProblemSetAppend(tsprobs, type, alGetPkgNVR(al, alp), + alp->key, dn, bn, altNEVR, ulong1); +} + availableList alCreate(int delta) { availableList al = xcalloc(1, sizeof(*al)); diff --git a/lib/rpmal.h b/lib/rpmal.h index b84c0e7..fcab42f 100644 --- a/lib/rpmal.h +++ b/lib/rpmal.h @@ -6,13 +6,8 @@ * Structures used for managing added/available package lists. */ -#if 0 -typedef /*@abstract@*/ struct fileIndexEntry_s * fileIndexEntry; -typedef /*@abstract@*/ struct dirInfo_s * dirInfo; -typedef /*@abstract@*/ struct availableIndexEntry_s * availableIndexEntry; -typedef /*@abstract@*/ struct availableIndex_s * availableIndex; -#endif - +/** + */ typedef /*@abstract@*/ struct tsortInfo_s * tsortInfo; /** \ingroup rpmdep @@ -72,7 +67,7 @@ extern "C" { * @param al available list * @return no. of packages in list */ -int alGetSize(availableList al) +int alGetSize(const availableList al) /*@*/; /** @@ -82,10 +77,60 @@ int alGetSize(availableList al) * @return available package key */ /*@kept@*/ /*@null@*/ -const void * alGetKey(/*@null@*/ availableList al, int pkgNum) +const void * alGetKey(/*@null@*/ const availableList al, int pkgNum) /*@*/; /** + * Return available package multiLib flag. + * @param al available list + * @param pkgNum available package index + * @return available package multiLib flag + */ +int alGetMultiLib(/*@null@*/ const availableList al, int pkgNum) + /*@*/; + +/** + * Return available package files count. + * @param al available list + * @param pkgNum available package index + * @return available package files count + */ +int alGetFilesCount(/*@null@*/ const availableList al, int pkgNum) + /*@*/; + +/** + * Return available package header. + * @param al available list + * @param pkgNum available package index + * @param unlink Should alp->h be unlinked? + * @return available package header + */ +Header alGetHeader(/*@null@*/ availableList al, int pkgNum, int unlink) + /*@modifies al @*/; + +/** + * Return available package relocations. + * @warning alp->relocs set to NULL after call. + * @param al available list + * @param pkgNum available package index + * @return available package relocations + */ +/*@null@*/ +rpmRelocation * alGetRelocs(/*@null@*/ availableList al, int pkgNum) + /*@modifies al @*/; + +/** + * Return available package file handle. + * @warning alp->fd set to NULL after call. + * @param al available list + * @param pkgNum available package index + * @return available package file handle + */ +/*@null@*/ +FD_t alGetFd(/*@null@*/ availableList al, int pkgNum) + /*@modifies al @*/; + +/** * Return available package. * @param al available list * @param pkgNum available package index @@ -101,18 +146,31 @@ availablePackage alGetPkg(/*@null@*/ availableList al, int pkgNum) * @param alp available package pointer * @return available package index, -1 on failure */ -int alGetPkgIndex(/*@null@*/ availableList al, availablePackage alp) +int alGetPkgIndex(/*@null@*/ const availableList al, const availablePackage alp) /*@*/; /** * Return (malloc'd) available package name-version-release string. * @param al available list * @param alp available package pointer - * @return + * @return name-version-release string */ +/*@-exportlocal@*/ /*@only@*/ /*@null@*/ -const char * alGetPkgNVR(/*@null@*/ availableList al, availablePackage alp) +char * alGetPkgNVR(/*@null@*/const availableList al, const availablePackage alp) /*@*/; +/*@=exportlocal@*/ + +/** + * Append available package problem to set. + */ +/*@unused@*/ +void alProblemSetAppend(const availableList al, const availablePackage alp, + rpmProblemSet tsprobs, rpmProblemType type, + const char * dn, const char * bn, + /*@only@*/ /*@null@*/ const char * altNEVR, + unsigned long ulong1) + /*@modifies tsprobs @*/; /** * Initialize available packckages, items, and directory list. diff --git a/lib/rpmlib.h b/lib/rpmlib.h index 4041a66..5b9d2b3 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -1055,12 +1055,13 @@ void rpmProblemSetPrint(FILE *fp, rpmProblemSet tsprobs) /** * Append problem to set. */ -void rpmProblemSetAppend(const rpmTransactionSet ts, - rpmProblemSet tsprobs, rpmProblemType type, - const availablePackage alp, +void rpmProblemSetAppend(rpmProblemSet tsprobs, rpmProblemType type, + /*@only@*/ /*@null@*/ const char * pkgNEVR, + /*@exposed@*/ /*@null@*/ const void * key, const char * dn, const char * bn, - Header altH, unsigned long ulong1) - /*@modifies tsprobs, alp @*/; + /*@only@*/ /*@null@*/ const char * altNEVR, + unsigned long ulong1) + /*@modifies tsprobs @*/; /** * Filter a problem set. diff --git a/lib/transaction.c b/lib/transaction.c index e0d193c..62c7130 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -56,7 +56,10 @@ extern int statvfs (const char * file, /*@out@*/ struct statvfs * buf) /*@access TFI_t@*/ /*@access PSM_t@*/ +#if 0 /*@access availablePackage@*/ +#endif + /*@access transactionElement@*/ /** @@ -384,9 +387,14 @@ static int handleInstInstalledFiles(const rpmTransactionSet ts, TFI_t fi, fi->fmodes[fileNum], fi->fmd5s[fileNum], fi->flinks[fileNum])) { + /*@-compdef@*/ /* FIX: *fi->replaced undefined */ if (reportConflicts) - rpmProblemSetAppend(ts, ts->probs, RPMPROB_FILE_CONFLICT, fi->ap, - fi->dnl[fi->dil[fileNum]], fi->bnl[fileNum], h, 0); + rpmProblemSetAppend(ts->probs, RPMPROB_FILE_CONFLICT, + fiGetNVR(fi), fi->key, + fi->dnl[fi->dil[fileNum]], fi->bnl[fileNum], + hGetNVR(h, NULL), + 0); + /*@=compdef@*/ if (!(otherFlags[otherFileNum] | fi->fflags[fileNum]) & RPMFILE_CONFIG) { /*@-assignexpose@*/ @@ -589,11 +597,13 @@ static void handleOverlappedFiles(const rpmTransactionSet ts, TFI_t fi) recs[otherPkgNum]->flinks[otherFileNum], fi->fmodes[i], fi->fmd5s[i], - fi->flinks[i])) { - /*@-nullstate@*/ /* FIX: ts->di is possibly NULL */ - rpmProblemSetAppend(ts, ts->probs, RPMPROB_NEW_FILE_CONFLICT, fi->ap, - filespec, NULL, recs[otherPkgNum]->ap->h, 0); - /*@=nullstate@*/ + fi->flinks[i])) + { + rpmProblemSetAppend(ts->probs, RPMPROB_NEW_FILE_CONFLICT, + fiGetNVR(fi), fi->key, + filespec, NULL, + fiGetNVR(recs[otherPkgNum]), + 0); } /* Try to get the disk accounting correct even if a conflict. */ @@ -671,25 +681,32 @@ static void handleOverlappedFiles(const rpmTransactionSet ts, TFI_t fi) ds->bneeded -= BLOCK_ROUND(fixupSize, ds->bsize); } } - if (filespec) free(filespec); + filespec = _free(filespec); } /** */ -static int ensureOlder(rpmTransactionSet ts, availablePackage alp, Header old) - /*@modifies ts, alp @*/ +static int ensureOlder(rpmTransactionSet ts, + const Header h, /*@null@*/ const Header old, + /*@dependent@*/ /*@null@*/ const void * key) + /*@modifies ts @*/ { int result, rc = 0; if (old == NULL) return 1; - result = rpmVersionCompare(old, alp->h); + result = rpmVersionCompare(old, h); if (result <= 0) rc = 0; else if (result > 0) { rc = 1; - rpmProblemSetAppend(ts, ts->probs, RPMPROB_OLDPACKAGE, alp, - NULL, NULL, old, 0); + /*@-evalorder@*/ /* LCL: is confused */ + rpmProblemSetAppend(ts->probs, RPMPROB_OLDPACKAGE, + hGetNVR(h, NULL), key, + NULL, NULL, + hGetNVR(old, NULL), + 0); + /*@=evalorder@*/ } return rc; @@ -897,31 +914,6 @@ static int tsGetOc(void * a) } /** - * Return transaction element available package pointer. - * @param a transaction element iterator - * @return available package pointer - */ -static /*@dependent@*/ availablePackage tsGetAlp(void * a) - /*@*/ -{ - struct tsIterator_s * iter = a; - availablePackage alp = NULL; - int oc = iter->ocsave; - - /*@-branchstate@*/ - if (oc != -1) { - rpmTransactionSet ts = iter->ts; - TFI_t fi = ts->flList + oc; - if (fi->type == TR_ADDED) - alp = alGetPkg(ts->addedPackages, ts->order[oc].u.addedIndex); - } - /*@=branchstate@*/ - /*@-nullret@*/ /* FIX: alp can be NULL */ - return alp; - /*@=nullret@*/ -} - -/** * Destroy transaction element iterator. * @param a transaction element iterator * @return NULL always @@ -985,7 +977,6 @@ int rpmRunTransactions( rpmTransactionSet ts, { int i, j; int ourrc = 0; - availablePackage alp; int totalFileCount = 0; TFI_t fi; struct diskspaceInfo * dip; @@ -1094,47 +1085,57 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ * - count files. */ /* The ordering doesn't matter here */ - for (i = 0; i < alGetSize(ts->addedPackages); i++) - { - alp = alGetPkg(ts->addedPackages, i); - if (alp == NULL) - break; + for (i = 0; i < alGetSize(ts->addedPackages); i++) { + const char * n, * v, * r; + const void * key; + rpmdbMatchIterator mi; + Header h; + + h = alGetHeader(ts->addedPackages, i, 0); + if (h == NULL) /* XXX can't happen */ + continue; + + (void) headerNVR(h, &n, &v, &r); + key = alGetKey(ts->addedPackages, i); - if (!archOkay(alp->h) && !(ts->ignoreSet & RPMPROB_FILTER_IGNOREARCH)) - rpmProblemSetAppend(ts, ts->probs, RPMPROB_BADARCH, alp, + if (!archOkay(h) && !(ts->ignoreSet & RPMPROB_FILTER_IGNOREARCH)) + rpmProblemSetAppend(ts->probs, RPMPROB_BADARCH, + hGetNVR(h, NULL), key, NULL, NULL, NULL, 0); - if (!osOkay(alp->h) && !(ts->ignoreSet & RPMPROB_FILTER_IGNOREOS)) - rpmProblemSetAppend(ts, ts->probs, RPMPROB_BADOS, alp, + if (!osOkay(h) && !(ts->ignoreSet & RPMPROB_FILTER_IGNOREOS)) + rpmProblemSetAppend(ts->probs, RPMPROB_BADOS, + hGetNVR(h, NULL), key, NULL, NULL, NULL, 0); if (!(ts->ignoreSet & RPMPROB_FILTER_OLDPACKAGE)) { - rpmdbMatchIterator mi; Header oldH; - mi = rpmtsInitIterator(ts, RPMTAG_NAME, alp->name, 0); + mi = rpmtsInitIterator(ts, RPMTAG_NAME, n, 0); while ((oldH = rpmdbNextIterator(mi)) != NULL) - xx = ensureOlder(ts, alp, oldH); + xx = ensureOlder(ts, h, oldH, key); mi = rpmdbFreeIterator(mi); } /* XXX multilib should not display "already installed" problems */ - if (!(ts->ignoreSet & RPMPROB_FILTER_REPLACEPKG) && !alp->multiLib) { - rpmdbMatchIterator mi; - mi = rpmtsInitIterator(ts, RPMTAG_NAME, alp->name, 0); - xx = rpmdbSetIteratorRE(mi, RPMTAG_VERSION, - RPMMIRE_DEFAULT, alp->version); - xx = rpmdbSetIteratorRE(mi, RPMTAG_RELEASE, - RPMMIRE_DEFAULT, alp->release); + if (!(ts->ignoreSet & RPMPROB_FILTER_REPLACEPKG) + && !alGetMultiLib(ts->addedPackages, i)) + { + mi = rpmtsInitIterator(ts, RPMTAG_NAME, n, 0); + xx = rpmdbSetIteratorRE(mi, RPMTAG_VERSION, RPMMIRE_DEFAULT, v); + xx = rpmdbSetIteratorRE(mi, RPMTAG_RELEASE, RPMMIRE_DEFAULT, r); while (rpmdbNextIterator(mi) != NULL) { - rpmProblemSetAppend(ts, ts->probs, RPMPROB_PKG_INSTALLED, alp, + rpmProblemSetAppend(ts->probs, RPMPROB_PKG_INSTALLED, + hGetNVR(h, NULL), key, NULL, NULL, NULL, 0); /*@innerbreak@*/ break; } mi = rpmdbFreeIterator(mi); } - totalFileCount += alp->filesCount; + totalFileCount += alGetFilesCount(ts->addedPackages, i); + + h = headerFree(h); } @@ -1155,7 +1156,7 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ } /* =============================================== - * Initialize file list: + * Initialize transaction element file info for package: */ ts->flEntries = alGetSize(ts->addedPackages) + ts->numRemovedPackages; ts->flList = xcalloc(ts->flEntries, sizeof(*ts->flList)); @@ -1170,16 +1171,28 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ oc = tsGetOc(tsi); fi->magic = TFIMAGIC; - /* XXX watchout: fi->type must be set for tsGetAlp() to "work" */ fi->type = ts->order[oc].type; + /*@-branchstate@*/ switch (fi->type) { case TR_ADDED: - /* XXX watchout: fi->type must be set for tsGetAlp() to "work" */ - fi->ap = tsGetAlp(tsi); fi->record = 0; - loadFi(ts, fi, fi->ap->h, keep_header); -/* XXX free fi->ap->h here if/when possible */ + + i = ts->order[oc].u.addedIndex; + + fi->h = alGetHeader(ts->addedPackages, i, 1); + fi->multiLib = alGetMultiLib(ts->addedPackages, i); + /*@-kepttrans@*/ + fi->key = alGetKey(ts->addedPackages, i); + /*@=kepttrans@*/ + fi->relocs = alGetRelocs(ts->addedPackages, i); + fi->fd = alGetFd(ts->addedPackages, i); + + /* XXX availablePackage can be dumped here XXX */ + + /* XXX header arg unused. */ + loadFi(ts, fi, fi->h, keep_header); + if (fi->fc == 0) continue; @@ -1187,7 +1200,6 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ skipFiles(ts, fi); /*@switchbreak@*/ break; case TR_REMOVED: - fi->ap = NULL; fi->record = ts->order[oc].u.removed.dboffset; /* Retrieve erased package header from the database. */ { rpmdbMatchIterator mi; @@ -1367,12 +1379,14 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ /*@innercontinue@*/ continue; if (adj_fs_blocks(dip->bneeded) > dip->bavail) - rpmProblemSetAppend(ts, ts->probs, RPMPROB_DISKSPACE, fi->ap, + rpmProblemSetAppend(ts->probs, RPMPROB_DISKSPACE, + fiGetNVR(fi), fi->key, ts->filesystems[i], NULL, NULL, (adj_fs_blocks(dip->bneeded) - dip->bavail) * dip->bsize); if (adj_fs_blocks(dip->ineeded) > dip->iavail) - rpmProblemSetAppend(ts, ts->probs, RPMPROB_DISKNODES, fi->ap, + rpmProblemSetAppend(ts->probs, RPMPROB_DISKNODES, + fiGetNVR(fi), fi->key, ts->filesystems[i], NULL, NULL, (adj_fs_blocks(dip->ineeded) - dip->iavail)); } @@ -1428,8 +1442,9 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ ts->flList = freeFl(ts, ts->flList); ts->flEntries = 0; - /*@-nullstate@*/ - psm->ts = rpmtsUnlink(psm->ts, "tsRun (problems)"); + if (psm->ts != NULL) + psm->ts = rpmtsUnlink(psm->ts, "tsRun (problems)"); + /*@-nullstate@*/ /* FIX: ts->flList may be NULL */ return ts->orderCount; /*@=nullstate@*/ } @@ -1467,50 +1482,53 @@ int keep_header = 1; /* XXX rpmProblemSetAppend prevents dumping headers. */ Header h; int gotfd; + oc = tsGetOc(tsi); gotfd = 0; psm->fi = rpmfiLink(fi, "tsInstall"); switch (fi->type) { case TR_ADDED: - alp = tsGetAlp(tsi); -assert(alp == fi->ap); - i = alGetPkgIndex(ts->addedPackages, alp); + + i = ts->order[oc].u.addedIndex; rpmMessage(RPMMESS_DEBUG, "========== +++ %s-%s-%s\n", fi->name, fi->version, fi->release); h = (fi->h ? headerLink(fi->h) : NULL); /*@-branchstate@*/ - if (alp->fd == NULL) { - alp->fd = ts->notify(fi->h, RPMCALLBACK_INST_OPEN_FILE, 0, 0, - alp->key, ts->notifyData); - if (alp->fd) { + if (fi->fd == NULL) { + /*@-noeffectuncon @*/ /* FIX: ??? */ + fi->fd = ts->notify(fi->h, RPMCALLBACK_INST_OPEN_FILE, 0, 0, + fi->key, ts->notifyData); + /*@=noeffectuncon @*/ + if (fi->fd != NULL) { rpmRC rpmrc; h = headerFree(h); /*@-mustmod@*/ /* LCL: segfault */ - rpmrc = rpmReadPackageFile(ts, alp->fd, + rpmrc = rpmReadPackageFile(ts, fi->fd, "rpmRunTransactions", &h); /*@=mustmod@*/ if (!(rpmrc == RPMRC_OK || rpmrc == RPMRC_BADSIZE)) { /*@-noeffectuncon @*/ /* FIX: check rc */ - (void)ts->notify(fi->h, RPMCALLBACK_INST_CLOSE_FILE, - 0, 0, alp->key, ts->notifyData); + (void) ts->notify(fi->h, RPMCALLBACK_INST_CLOSE_FILE, + 0, 0, + fi->key, ts->notifyData); /*@=noeffectuncon @*/ - alp->fd = NULL; + fi->fd = NULL; ourrc++; } else if (fi->h != NULL) { - Header foo = relocateFileList(ts, fi, alp, h, NULL); + Header foo = relocateFileList(ts, fi, h, NULL); h = headerFree(h); h = headerLink(foo); foo = headerFree(foo); } - if (alp->fd) gotfd = 1; + if (fi->fd != NULL) gotfd = 1; } } /*@=branchstate@*/ - if (alp->fd) { + if (fi->fd != NULL) { Header hsave = NULL; if (fi->h) { @@ -1520,24 +1538,37 @@ assert(alp == fi->ap); } else { char * fstates = fi->fstates; fileAction * actions = fi->actions; +uint_32 multiLib = fi->multiLib; +const void * key = fi->key; +rpmRelocation * relocs = fi->relocs; +FD_t fd = fi->fd; + fi->fstates = NULL; fi->actions = NULL; +fi->key = NULL; +fi->relocs = NULL; +fi->fd = NULL; freeFi(fi); oc = tsGetOc(tsi); fi->magic = TFIMAGIC; fi->type = ts->order[oc].type; -fi->ap = tsGetAlp(tsi); fi->record = 0; loadFi(ts, fi, h, 1); fi->fstates = _free(fi->fstates); fi->fstates = fstates; fi->actions = _free(fi->actions); fi->actions = actions; +fi->multiLib = multiLib; +fi->key = key; +fi->relocs = relocs; +/*@-newreftrans@*/ +/*@i@*/ fi->fd = fd; +/*@=newreftrans@*/ + } - if (alp->multiLib) + if (fi->multiLib) ts->transFlags |= RPMTRANS_FLAG_MULTILIB; -assert(alp == fi->ap); if (psmStage(psm, PSM_PKGINSTALL)) { ourrc++; lastFailed = i; @@ -1557,9 +1588,9 @@ assert(alp == fi->ap); if (gotfd) { /*@-noeffectuncon @*/ /* FIX: check rc */ (void)ts->notify(fi->h, RPMCALLBACK_INST_CLOSE_FILE, 0, 0, - alp->key, ts->notifyData); + fi->key, ts->notifyData); /*@=noeffectuncon @*/ - alp->fd = NULL; + fi->fd = NULL; } freeFi(fi); /*@switchbreak@*/ break; @@ -1587,7 +1618,7 @@ assert(alp == fi->ap); psm->ts = rpmtsUnlink(psm->ts, "tsRun"); - /*@-nullstate@*/ + /*@-nullstate@*/ /* FIX: ts->flList may be NULL */ if (ourrc) return -1; else diff --git a/po/cs.po b/po/cs.po index 933b0e3..5150f6c 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -831,7 +831,7 @@ msgstr "Nemohu p msgid "Could not open %s: %s\n" msgstr "Nemohu otevøít %s: %s\n" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, c-format msgid "Unable to write package: %s\n" msgstr "Nemohu zapsat balíèek: %s\n" @@ -861,7 +861,7 @@ msgstr "Nemohu p msgid "Unable to write payload to %s: %s\n" msgstr "Nemohu zapsat payload do %s: %s\n" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "Zapsáno: %s\n" @@ -1447,11 +1447,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "ANO" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "NE " @@ -1460,57 +1460,57 @@ msgstr "NE " msgid "cannot open Packages database in %s\n" msgstr "nemohu otevøít databázi balíèkù v %s\n" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "balíèek %s je ji¾ nainstalován" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-s (ke¹ováno)\n" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s ANO (rpmrc poskytuje)\n" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s ANO (rpmlib poskytuje)\n" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s ANO (db soubory)\n" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s ANO (db poskytuje)\n" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s ANO (db balíèek)\n" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NE\n" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) pøidáno do ke¹e závislostí.\n" @@ -1518,43 +1518,43 @@ msgstr "%s: (%s, %s) p #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, 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:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "balíèek %s koliduje: %s\n" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, 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:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "========== ukládání tsort relací\n" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 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:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "SMYÈKA:\n" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "========== pokraèuje tsort ...\n" @@ -1658,7 +1658,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "Poèet dataLength() RPM_STRING_TYPE musí být 1.\n" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "Datový typ %d není podporován\n" @@ -2179,173 +2179,173 @@ msgstr "podepsat bal msgid "generate signature" msgstr "generovat PGP/GPG podpis" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " je nutné pro %s-%s-%s\n" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " koliduje s %s-%s-%s\n" -#: lib/problems.c:293 +#: lib/problems.c:251 #, c-format msgid "package %s is for a different architecture" msgstr "balíèek %s je pro jinou architekturu" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "balíèek %s je pro jiný operaèní systém" -#: lib/problems.c:303 +#: lib/problems.c:261 #, c-format msgid "package %s is already installed" msgstr "balíèek %s je ji¾ nainstalován" -#: lib/problems.c:308 +#: lib/problems.c:266 #, c-format msgid "path %s in package %s is not relocateable" msgstr "cesta %s v balíèku %s není pøemístitelná" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "soubor %s zpùsobuje konflikt mezi instalovaným %s a %s" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "soubor %s z instalace %s koliduje se souborem z balíèku %s" -#: lib/problems.c:323 +#: lib/problems.c:281 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "balíèek %s (který je novìj¹í, ne¾ %s) je ji¾ nainstalován" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "instalace balíèku %s potøebuje %ld%cB na systému souborù %s" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "instalace balíèku %s potøebuje %ld inodù na systému souborù %s" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "pøedtransakèní syscall v balíèku %s: %s selhalo: %s" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "neznámá chyba %d vznikla pøi manipulaci s balíèkem %s" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "========== relokace\n" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "%5d vynechávám %s\n" -#: lib/psm.c:253 +#: lib/psm.c:271 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d pøemís»uji %s -> %s\n" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "vynechávám multilib cestu %s%s\n" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "vynechávám %s %s\n" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "pøemís»uji %s do %s\n" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "pøemís»uji adresáø %s do %s\n" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, c-format msgid "cannot create %%%s %s\n" msgstr "nemohu vytvoøit %s: %s\n" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, c-format msgid "cannot write to %%%s %s\n" msgstr "nemohu zapsat do %%%s %s\n" -#: lib/psm.c:1173 +#: lib/psm.c:1191 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:1287 +#: lib/psm.c:1314 msgid "source package contains no .spec file\n" msgstr "zdrojový balíèek neobsahuje .spec soubor\n" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: spou¹tím %s skript(y) (pokud existují)\n" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, 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:1572 +#: lib/psm.c:1599 #, 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:1919 +#: lib/psm.c:1946 #, 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:2036 +#: lib/psm.c:2063 #, 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:2151 +#: lib/psm.c:2177 #, 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:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ita skupina root\n" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalování archívu selhalo %s%s: %s\n" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr " na souboru " -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nemohu otevøít %s: %s\n" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s selhalo\n" @@ -2863,13 +2863,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Podpisu: velikost(%d)+vata(%d)\n" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s pøeskoèeno, proto¾e chybí pøíznak\n" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "vynechávám adresáø %s\n" diff --git a/po/da.po b/po/da.po index aba262c..0a89789 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -828,7 +828,7 @@ msgstr "Kunne ikke l msgid "Could not open %s: %s\n" msgstr "Kunne ikke åbne %s: %s\n" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunne ikke skrive pakke: %s\n" @@ -858,7 +858,7 @@ msgstr "Kunne ikke l msgid "Unable to write payload to %s: %s\n" msgstr "Kunne ikke skrive pakkeindhold til %s: %s\n" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1448,11 +1448,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 #, fuzzy msgid "NO " msgstr "IKKE O.K." @@ -1462,57 +1462,57 @@ msgstr "IKKE O.K." msgid "cannot open Packages database in %s\n" msgstr "kunne ikke åbne Packages-database i %s\n" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "pakken %s er allerede installeret" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-3s (husket)\n" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s JA (rpmrc tilfører)\n" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s JA (rpmlib tilfører)\n" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s JA (db-filer)\n" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s JA (db tilfører)\n" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s JA (db-pakke)\n" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NEJ\n" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) tilføjet til afhængigheds-buffer.\n" @@ -1520,42 +1520,42 @@ msgstr "%s: (%s, %s) tilf #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, 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:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "pakke %s skaber konflikt: %s\n" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, 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:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "========== gemmer tsort-relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "LØKKE:\n" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "========== fortsætter tsort ...\n" @@ -1658,7 +1658,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE-antal skal være 1.\n" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "Datatype %d understøttes ikke\n" @@ -2197,176 +2197,176 @@ msgstr "underskriv en pakke (slet nuv msgid "generate signature" msgstr "generér PGP/GPG-signatur" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " kræves af %s-%s-%s\n" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " skaber konflikt med %s-%s-%s\n" -#: lib/problems.c:293 +#: lib/problems.c:251 #, c-format msgid "package %s is for a different architecture" msgstr "pakken %s hører til en anden arkitektur" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "pakken %s hører til et andet operativsystem" -#: lib/problems.c:303 +#: lib/problems.c:261 #, c-format msgid "package %s is already installed" msgstr "pakken %s er allerede installeret" -#: lib/problems.c:308 +#: lib/problems.c:266 #, c-format msgid "path %s in package %s is not relocateable" msgstr "sti %s i pakke %s kan ikke omrokeres" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "filen %s skaber konflikt mellem den forsøgte installation af %s og %s" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" "filen %s fra installationen af %s skaber konflikt med fil fra pakken %s" -#: lib/problems.c:323 +#: lib/problems.c:281 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "pakke %s (som er nyere end %s) er allerede installeret" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "installation af pakke %s kræver %ld%cb på %s-filsystemet" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "installation af pakken %s kræver %ld inode'r på %s-filsystemet" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "pakke %s prætransaktion-systemkald: %s mislykkedes: %s" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ukendt fejl %d under arbejdet med pakken %s" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "========== gemmer omrokeringer\n" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "%5d ekskluderer %s\n" -#: lib/psm.c:253 +#: lib/psm.c:271 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d omrokerer %s -> %s\n" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "ekskluderer multilib-sti %s%s\n" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "ekskluderer %s %s\n" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "omrokerer %s til %s\n" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "omrokerer kataloget %s til %s\n" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "kan ikke oprette %s: %s\n" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "kunne ikke skrive til %s\n" -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binær fundet\n" -#: lib/psm.c:1287 +#: lib/psm.c:1314 msgid "source package contains no .spec file\n" msgstr "kildepakke indeholder ingen .spec-fil\n" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "kører postinstallations-skript (hvis det findes)\n" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, 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:1572 +#: lib/psm.c:1599 #, 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:1919 +#: lib/psm.c:1946 #, 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:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "bruger %s eksisterer ikke - bruger root\n" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "gruppe %s eksisterer ikke - bruger root\n" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "udpakning af arkiv mislykkedes%s%s: %s\n" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr " for fil " -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s mislykkedes\n" @@ -2885,13 +2885,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signaturfyld : %d\n" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s oversprunget grundet manglende ok-flag\n" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer kataloget %s\n" diff --git a/po/de.po b/po/de.po index 66decd8..a6426e5 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -921,7 +921,7 @@ msgid "Could not open %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen\n" # , c-format -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nicht möglich %s zu schreiben" @@ -956,7 +956,7 @@ msgstr "Nicht m msgid "Unable to write payload to %s: %s\n" msgstr "Nicht möglich %s zu schreiben" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1581,11 +1581,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "" @@ -1594,57 +1594,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "Paket %s ist nicht installiert\n" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:883 +#: lib/depends.c:882 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:934 +#: lib/depends.c:933 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" @@ -1652,43 +1652,43 @@ msgstr "die Datei #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, 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:1123 +#: lib/depends.c:1122 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" # FIXME -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, 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:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1795,7 +1795,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2363,183 +2363,183 @@ msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)" msgid "generate signature" msgstr "PGP-Signatur generieren" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " wird von %s-%s-%s gebraucht\n" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " steht im Konflikt mit %s-%s-%s\n" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/problems.c:293 +#: lib/problems.c:251 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/problems.c:298 +#: lib/problems.c:256 #, fuzzy, c-format msgid "package %s is for a different operating system" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/problems.c:303 +#: lib/problems.c:261 #, fuzzy, c-format msgid "package %s is already installed" msgstr "Paket %s ist nicht installiert\n" -#: lib/problems.c:308 +#: lib/problems.c:266 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "Paket %s ist nicht installiert\n" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:276 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr " steht im Konflikt mit %s-%s-%s\n" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/problems.c:323 +#: lib/problems.c:281 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/problems.c:343 +#: lib/problems.c:301 #, fuzzy, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" # , c-format -#: lib/psm.c:250 +#: lib/psm.c:268 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "Hole %s heraus\n" -#: lib/psm.c:253 +#: lib/psm.c:271 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "kann Datei %s nicht öffnen: " # , c-format -#: lib/psm.c:323 +#: lib/psm.c:341 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "Hole %s heraus\n" # , c-format -#: lib/psm.c:389 +#: lib/psm.c:407 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "Hole %s heraus\n" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:478 +#: lib/psm.c:496 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1287 +#: lib/psm.c:1314 #, fuzzy msgid "source package contains no .spec file\n" msgstr "Anfrage nach Paket, das die Datei besitzt" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "Keine Stufen ausführen" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, 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:1572 +#: lib/psm.c:1599 #, 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:1919 +#: lib/psm.c:1946 #, 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:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp fehlgeschlagen" @@ -3081,13 +3081,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" diff --git a/po/en_RN.po b/po/en_RN.po index e8ca532..4e5123f 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-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,42 +1494,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1630,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2137,173 +2137,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:251 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:261 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:308 +#: lib/problems.c:266 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:323 +#: lib/problems.c:281 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:253 +#: lib/psm.c:271 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1287 +#: lib/psm.c:1314 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1572 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1919 +#: lib/psm.c:1946 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr "" -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2817,13 +2817,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/es.po b/po/es.po index e8ca532..4e5123f 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,42 +1494,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1630,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2137,173 +2137,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:251 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:261 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:308 +#: lib/problems.c:266 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:323 +#: lib/problems.c:281 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:253 +#: lib/psm.c:271 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1287 +#: lib/psm.c:1314 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1572 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1919 +#: lib/psm.c:1946 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr "" -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2817,13 +2817,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/eu_ES.po b/po/eu_ES.po index e8ca532..4e5123f 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-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,42 +1494,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1630,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2137,173 +2137,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:251 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:261 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:308 +#: lib/problems.c:266 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:323 +#: lib/problems.c:281 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:253 +#: lib/psm.c:271 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1287 +#: lib/psm.c:1314 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1572 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1919 +#: lib/psm.c:1946 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr "" -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2817,13 +2817,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/fi.po b/po/fi.po index 0088e0c..3cf1ba5 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -835,7 +835,7 @@ msgstr "%s:n kirjoitus ei onnistu" msgid "Could not open %s: %s\n" msgstr "%s:n avaus epäonnistui\n" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "%s:n kirjoitus ei onnistu" @@ -865,7 +865,7 @@ msgstr "%s:n kirjoitus ei onnistu" msgid "Unable to write payload to %s: %s\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1464,11 +1464,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "" @@ -1477,57 +1477,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "virhe: en voi avata %s%s/packages.rpm\n" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:883 +#: lib/depends.c:882 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:934 +#: lib/depends.c:933 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "tiedostoa %s ei omista mikään paketti\n" @@ -1535,42 +1535,42 @@ msgstr "tiedostoa %s ei omista mik #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, 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:1123 +#: lib/depends.c:1122 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, 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:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1673,7 +1673,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2230,174 +2230,174 @@ msgstr "allekirjoita paketti (hylk msgid "generate signature" msgstr "generoi PGP-allekirjoitus" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "vaatii %s-%s-%s\n" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " on ristiriidassa %s-%s-%s:n kanssa\n" -#: lib/problems.c:293 +#: lib/problems.c:251 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/problems.c:298 +#: lib/problems.c:256 #, fuzzy, c-format msgid "package %s is for a different operating system" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/problems.c:303 +#: lib/problems.c:261 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paketti %s ei ole asennettu\n" -#: lib/problems.c:308 +#: lib/problems.c:266 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paketti %s ei ole asennettu\n" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:276 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr " on ristiriidassa %s-%s-%s:n kanssa\n" -#: lib/problems.c:323 +#: lib/problems.c:281 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:343 +#: lib/problems.c:301 #, fuzzy, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:250 +#: lib/psm.c:268 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "Haen: %s\n" -#: lib/psm.c:253 +#: lib/psm.c:271 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/psm.c:323 +#: lib/psm.c:341 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "Haen: %s\n" -#: lib/psm.c:389 +#: lib/psm.c:407 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "Haen: %s\n" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:478 +#: lib/psm.c:496 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1287 +#: lib/psm.c:1314 #, fuzzy msgid "source package contains no .spec file\n" msgstr "kysy pakettia, jonka omistuksessa on" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "älä suorita mitään vaiheita" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, 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:1572 +#: lib/psm.c:1599 #, 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:1919 +#: lib/psm.c:1946 #, 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:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr "" -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp epäonnistui" @@ -2932,13 +2932,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" diff --git a/po/fr.po b/po/fr.po index 377ebe1..b9c59e0 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -870,7 +870,7 @@ msgstr "impossible d'ouvrir: %s\n" msgid "Could not open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -900,7 +900,7 @@ msgstr "impossible d'ouvrir: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1504,11 +1504,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "" @@ -1517,57 +1517,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1575,42 +1575,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, 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:1123 +#: lib/depends.c:1122 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1711,7 +1711,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2283,175 +2283,175 @@ msgstr "" msgid "generate signature" msgstr " --sign - genre une signature PGP" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:251 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:298 +#: lib/problems.c:256 #, fuzzy, c-format msgid "package %s is for a different operating system" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:303 +#: lib/problems.c:261 #, fuzzy, c-format msgid "package %s is already installed" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:308 +#: lib/problems.c:266 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:323 +#: lib/problems.c:281 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:253 +#: lib/psm.c:271 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:478 +#: lib/psm.c:496 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1287 +#: lib/psm.c:1314 #, fuzzy msgid "source package contains no .spec file\n" msgstr "" " -f + - interroge le package qui appartient " -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1572 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1919 +#: lib/psm.c:1946 #, 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:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "La construction a chou.\n" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr "" -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "La construction a chou.\n" @@ -2981,13 +2981,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/gl.po b/po/gl.po index 9137461..42f2c4b 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -811,7 +811,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -841,7 +841,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1418,11 +1418,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "" @@ -1431,57 +1431,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1489,42 +1489,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1625,7 +1625,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2132,173 +2132,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:251 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:261 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:308 +#: lib/problems.c:266 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:323 +#: lib/problems.c:281 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:253 +#: lib/psm.c:271 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1287 +#: lib/psm.c:1314 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1572 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1919 +#: lib/psm.c:1946 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr "" -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2812,13 +2812,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/hu.po b/po/hu.po index e8ca532..4e5123f 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,42 +1494,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1630,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2137,173 +2137,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:251 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:261 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:308 +#: lib/problems.c:266 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:323 +#: lib/problems.c:281 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:253 +#: lib/psm.c:271 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1287 +#: lib/psm.c:1314 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1572 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1919 +#: lib/psm.c:1946 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr "" -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2817,13 +2817,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/id.po b/po/id.po index e8ca532..4e5123f 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,42 +1494,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1630,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2137,173 +2137,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:251 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:261 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:308 +#: lib/problems.c:266 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:323 +#: lib/problems.c:281 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:253 +#: lib/psm.c:271 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1287 +#: lib/psm.c:1314 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1572 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1919 +#: lib/psm.c:1946 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr "" -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2817,13 +2817,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/is.po b/po/is.po index b1a0485..5c78a14 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -815,7 +815,7 @@ msgstr "Get ekki lesi msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, c-format msgid "Unable to write package: %s\n" msgstr "Get ekki ritað í pakka: %s\n" @@ -845,7 +845,7 @@ msgstr "Get ekki lesi msgid "Unable to write payload to %s: %s\n" msgstr "Get ekki ritað innihald í %s: %s\n" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "Skrifaði: %s\n" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "get ekki opnað pakka gagnagrunn í\n" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,42 +1494,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1630,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2142,173 +2142,173 @@ msgstr "" msgid "generate signature" msgstr "búa til undirskrift" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:251 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:261 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:308 +#: lib/problems.c:266 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:323 +#: lib/problems.c:281 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:253 +#: lib/psm.c:271 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d færa %s -> %s\n" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, c-format msgid "cannot create %%%s %s\n" msgstr "gat ekki búið til %%%s %s\n" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, c-format msgid "cannot write to %%%s %s\n" msgstr "get ekki ritað í %%%s %s\n" -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1287 +#: lib/psm.c:1314 msgid "source package contains no .spec file\n" msgstr "pakkinn inniheldur enga .spec skrá\n" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1572 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1919 +#: lib/psm.c:1946 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr "" -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "gat ekki opnað %s: %s\n" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s brást\n" @@ -2822,13 +2822,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/it.po b/po/it.po index e8ca532..4e5123f 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,42 +1494,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1630,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2137,173 +2137,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:251 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:261 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:308 +#: lib/problems.c:266 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:323 +#: lib/problems.c:281 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:253 +#: lib/psm.c:271 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1287 +#: lib/psm.c:1314 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1572 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1919 +#: lib/psm.c:1946 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr "" -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2817,13 +2817,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index bdec40a..a482d9d 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -862,7 +862,7 @@ msgstr " msgid "Could not open %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" @@ -892,7 +892,7 @@ msgstr " msgid "Unable to write payload to %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "½ñ¤­¹þ¤ßÃæ: %s\n" @@ -1498,11 +1498,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "" @@ -1511,57 +1511,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %s ¤Ï db ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" -#: lib/depends.c:866 +#: lib/depends.c:865 #, fuzzy, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:883 +#: lib/depends.c:882 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, fuzzy, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:934 +#: lib/depends.c:933 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %s ¤Ï db ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" @@ -1569,42 +1569,42 @@ msgstr "%s: %s #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, fuzzy, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n" #. conflicts exist. -#: lib/depends.c:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹: %s\n" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" #. Record all relations. -#: lib/depends.c:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1708,7 +1708,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabDate() RPM_STRING_TYPE ¥«¥¦¥ó¥È¤Ï 1 ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "¥Ç¡¼¥¿¥¿¥¤¥× %d ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" @@ -2281,185 +2281,185 @@ msgstr " msgid "generate signature" msgstr "PGP/GPG ½ð̾¤òÀ¸À®¤·¤Þ¤¹" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "¤Ï %s-%s-%s ¤ËɬÍפȤµ¤ì¤Æ¤¤¤Þ¤¹\n" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " %s-%s-%s ¤È¶¥¹ç¤·¤Þ¤¹\n" -#: lib/problems.c:293 +#: lib/problems.c:251 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¸þ¤±¤Ç¤¹" -#: lib/problems.c:298 +#: lib/problems.c:256 #, fuzzy, c-format msgid "package %s is for a different operating system" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë OS ¸þ¤±¤Ç¤¹" -#: lib/problems.c:303 +#: lib/problems.c:261 #, fuzzy, c-format msgid "package %s is already installed" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: lib/problems.c:308 +#: lib/problems.c:266 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Þ¤»¤ó" -#: lib/problems.c:313 +#: lib/problems.c:271 #, fuzzy, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" "¥Õ¥¡¥¤¥ë %s ¤Ï %s-%s-%s ¤È %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Î¥Õ¥¡¥¤¥ë¤È¶¥¹ç¤·¤Æ¤¤¤Þ¤¹" -#: lib/problems.c:318 +#: lib/problems.c:276 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" "%s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤«¤é¤Î¥Õ¥¡¥¤¥ë %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤«¤é¤Î¥Õ¥¡¥¤¥ë" "¤È¶¥¹ç¤·¤Æ¤¤¤Þ¤¹" -#: lib/problems.c:323 +#: lib/problems.c:281 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s (%s-%s-%s¤è¤ê¤â¿·¤·¤¤¤â¤Î) ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ" "¤¹" -#: lib/problems.c:328 +#: lib/problems.c:286 #, fuzzy, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å" "¤Ç)" -#: lib/problems.c:338 +#: lib/problems.c:296 #, fuzzy, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å" "¤Ç)" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:350 +#: lib/problems.c:308 #, fuzzy, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼ %d ¤¬¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤ÎÁàºîÃæ¤Ë¤ª¤­¤Þ¤·¤¿" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:250 +#: lib/psm.c:268 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "OS ¤Ï½ü³°¤µ¤ì¤Æ¤¤¤Þ¤¹: %s" -#: lib/psm.c:253 +#: lib/psm.c:271 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "%s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n" -#: lib/psm.c:323 +#: lib/psm.c:341 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "¥Õ¥¡¥¤¥ë¤Î½ü³°: %s%s\n" -#: lib/psm.c:389 +#: lib/psm.c:407 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "¥Õ¥¡¥¤¥ë¤Î½ü³°: %s%s\n" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "%s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n" -#: lib/psm.c:478 +#: lib/psm.c:496 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "%s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "%s ¤Ø½ñ¤­¹þ¤á¤Þ¤»¤ó" -#: lib/psm.c:1173 +#: lib/psm.c:1191 #, fuzzy msgid "source package expected, binary found\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Þ¤¹¡¢¥Ð¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Þ¤·¤¿" -#: lib/psm.c:1287 +#: lib/psm.c:1314 #, fuzzy msgid "source package contains no .spec file\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "¥Ý¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" -#: lib/psm.c:1572 +#: lib/psm.c:1599 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" -#: lib/psm.c:1919 +#: lib/psm.c:1946 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n" -#: lib/psm.c:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "¥æ¡¼¥¶ %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "¥°¥ë¡¼¥× %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿­Ä¹¤Ë¼ºÇÔ %s%s: %s" -#: lib/psm.c:2202 +#: lib/psm.c:2228 #, fuzzy msgid " on file " msgstr "¥Õ¥¡¥¤¥ë¾å" -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s ¼ºÇÔ" @@ -2992,13 +2992,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "½ð̾¥Ñ¥Ã¥É: %d\n" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n" diff --git a/po/ko.po b/po/ko.po index 7b375b0..d5f979b 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: 2001-09-07 22:03+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -822,7 +822,7 @@ msgstr " msgid "Could not open %s: %s\n" msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, c-format msgid "Unable to write package: %s\n" msgstr "ÆÐÅ°Áö¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n" @@ -852,7 +852,7 @@ msgstr "%s msgid "Unable to write payload to %s: %s\n" msgstr "%s ¿¡ payload¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "ÀÛ¼º: %s\n" @@ -1438,11 +1438,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "¿¹" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "¾Æ´Ï¿À" @@ -1451,57 +1451,57 @@ msgstr " msgid "cannot open Packages database in %s\n" msgstr "%s ¾ÈÀÇ ÆÐÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "%s ÆÐÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-s (ij½ÃµÊ)\n" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s ¿¹ (rpmrcÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s ¿¹ (rpmlibÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s ¿¹ (db ÆÄÀÏ)\n" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s ¿¹ (db ÆÐÅ°Áö)\n" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s ¾Æ´Ï¿À\n" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) ÀÇÁ¸(Depends) ij½Ã¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù.\n" @@ -1509,43 +1509,43 @@ msgstr "%s: (%s, %s) #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "%s-%s-%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n" #. conflicts exist. -#: lib/depends.c:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "ÆÐÅ°Áö %s (ÀÌ)°¡ Ãæµ¹ÇÔ: %s\n" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, 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:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== ÆÐÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼­, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, ±íÀÌ[depth])\n" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "========== ÈÄÀÓÀÚ [successors only] (Ç¥Çö ¼ø)\n" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "·çÇÁ(LOOP):\n" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n" @@ -1649,7 +1649,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE Ä«¿îÆ®´Â ¹Ýµå½Ã '1' À̾î¾ß ÇÕ´Ï´Ù.\n" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "%d µ¥ÀÌÅÍ À¯ÇüÀº »ç¿ëÇÏ½Ç ¼ö ¾ø½À´Ï´Ù\n" @@ -2173,185 +2173,185 @@ msgstr " msgid "generate signature" msgstr "¼­¸íÀ» ÀÛ¼ºÇÕ´Ï´Ù" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " (Àº)´Â %s-%s-%s ¿¡¼­ ÇÊ¿ä·Î ÇÕ´Ï´Ù\n" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " %s-%s-%s (¿Í)°ú Ãæµ¹ÇÕ´Ï´Ù\n" -#: lib/problems.c:293 +#: lib/problems.c:251 #, c-format msgid "package %s is for a different architecture" msgstr "%s (Àº)´Â ´Ù¸¥ ¾ÆÅ°ÅØÃĸ¦ À§ÇÑ ÆÐÅ°ÁöÀÔ´Ï´Ù" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "%s (Àº)´Â ´Ù¸¥ ¿î¿µÃ¼Á¦¸¦ À§ÇÑ ÆÐÅ°ÁöÀÔ´Ï´Ù" -#: lib/problems.c:303 +#: lib/problems.c:261 #, c-format msgid "package %s is already installed" msgstr "%s ÆÐÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/problems.c:308 +#: lib/problems.c:266 #, c-format msgid "path %s in package %s is not relocateable" msgstr "%2$s ÆÐÅ°Áö ¾ÈÀÇ %1$s °æ·Î´Â Àç¹èÄ¡ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "%2$s (¿Í)°ú %3$s ÀÇ ¼³Ä¡ °úÁ¤¿¡¼­ %1$s ÆÄÀÏÀÌ ¼­·Î Ãæµ¹ÇÕ´Ï´Ù" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "%2$s ¿¡¼­ ¼³Ä¡µÇ´Â %1$s ÆÄÀÏÀº %3$s ÆÐÅ°ÁöÀÇ ÆÄÀÏ°ú Ãæµ¹ÇÕ´Ï´Ù" -#: lib/problems.c:323 +#: lib/problems.c:281 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "%s ÆÐÅ°Áö (%s º¸´Ù ÃÖ½ÅÀÇ ÆÐÅ°Áö)´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" "%4$s ÆÄÀϽýºÅÛ »ó¿¡¼­ %1$s ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÒ °æ¿ì¿¡´Â %2$ld%3$cb (ÀÌ)°¡ ÇÊ¿äÇÕ" "´Ï´Ù" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" "%3$s ÆÄÀϽýºÅÛ »ó¿¡¼­ %1$s ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÒ °æ¿ì¿¡´Â %2$ld ÀÇ ¾ÆÀ̳ëµå(inode)" "°¡ ÇÊ¿äÇÕ´Ï´Ù" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" "%s ÆÐÅ°ÁöÀÇ ¼±(pre)-Æ®·£Àè¼Ç ½Ã½ºÅÛÄÝ(syscall): %s (ÀÌ)°¡ ½ÇÆÐÇß½À´Ï´Ù: %s" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" "%2$s ÆÐÅ°Áö¸¦ ó¸®ÇÏ´Â °úÁ¤¿¡¼­ ¾Ë ¼ö ¾ø´Â ¿À·ù %1$d (ÀÌ)°¡ ¹ß»ýÇß½À´Ï´Ù" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "========== Àç¹èÄ¡\n" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "%5d Á¦¿Ü(exclude) %s\n" -#: lib/psm.c:253 +#: lib/psm.c:271 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d Àç¹èÄ¡ %s -> %s\n" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "%s%s multilib °æ·Î¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "%s %s (À»)¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "%s ¿¡¼­ %s (À¸)·Î Àç¹èÄ¡ ÇÕ´Ï´Ù\n" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "%s µð·ºÅ丮¸¦ %s (À¸)·Î Àç¹èÄ¡ ÇÕ´Ï´Ù\n" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, c-format msgid "cannot create %%%s %s\n" msgstr "%%%s %s (À»)¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, c-format msgid "cannot write to %%%s %s\n" msgstr "%%%s %s (À»)¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "¼Ò½º ÆÐÅ°Áö°¡ ¿ä±¸µË´Ï´Ù, ¹ÙÀ̳ʸ®¸¦ ã¾Ò½À´Ï´Ù\n" -#: lib/psm.c:1287 +#: lib/psm.c:1314 msgid "source package contains no .spec file\n" msgstr "¼Ò½º ÆÐÅ°Áö¿¡ .spec ÆÄÀÏÀÌ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: %s ½ºÅ©¸³Æ®¸¦ ½ÇÇàÇÕ´Ï´Ù (ÀÖÀ» °æ¿ì)\n" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, 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:1572 +#: lib/psm.c:1599 #, 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:1919 +#: lib/psm.c:1946 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s (ÀÌ)°¡ %d ÀÇ ÆÄÀÏÀ» °®°í ÀÖ½À´Ï´Ù, Å×½ºÆ® = %d\n" -#: lib/psm.c:2036 +#: lib/psm.c:2063 #, 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:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "%s »ç¿ëÀÚ°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "%s ±×·ìÀÌ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¾ÆÄ«À̺긦 Ǫ´Âµ¥ ½ÇÆÐÇÔ%s%s: %s\n" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr " ´ÙÀ½ ÆÄÀÏ¿¡ " -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%2$s ÆÄÀÏÀÇ %1$s (ÀÌ)°¡ ½ÇÆÐÇÔ: %3$s\n" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, c-format msgid "%s failed: %s\n" msgstr "%s (ÀÌ)°¡ ½ÇÆÐÇÔ: %s\n" @@ -2868,13 +2868,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "¼­¸í: size(%d)+pad(%d)\n" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "missingok Ç÷¡±×·Î ÀÎÇØ %s (À»)¸¦ »ý·«ÇÕ´Ï´Ù\n" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "%s µð·ºÅ丮¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" diff --git a/po/no.po b/po/no.po index cb5a94f..084081c 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -825,7 +825,7 @@ msgstr "Kunne ikke msgid "Could not open %s: %s\n" msgstr "Kunne ikke åpne %s: %s\n" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunne ikke skrive pakke: %s\n" @@ -855,7 +855,7 @@ msgstr "Kunne ikke lese \"payload\" fra %s: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "Kunne ikke skrive \"payload\" til %s: %s\n" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1437,11 +1437,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "JA" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "NEI" @@ -1450,57 +1450,57 @@ msgstr "NEI" msgid "cannot open Packages database in %s\n" msgstr "kan ikke åpne pakkedatabase i %s\n" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "pakke %s er allerede installert" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1508,42 +1508,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "pakke %s er i konflikt: %s\n" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1644,7 +1644,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "Datatype %d ikke støttet\n" @@ -2164,173 +2164,173 @@ msgstr "signer en pakke (forkast n msgid "generate signature" msgstr "generer signatur" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " kreves av %s-%s-%s\n" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " er i konflikt med %s-%s-%s\n" -#: lib/problems.c:293 +#: lib/problems.c:251 #, c-format msgid "package %s is for a different architecture" msgstr "pakke %s er for en annen arkitektur" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "pakke %s er for et annet operativsystem" -#: lib/problems.c:303 +#: lib/problems.c:261 #, c-format msgid "package %s is already installed" msgstr "pakke %s er allerede installert" -#: lib/problems.c:308 +#: lib/problems.c:266 #, c-format msgid "path %s in package %s is not relocateable" msgstr "sti %s i pakke %s kan ikke relokeres" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:323 +#: lib/problems.c:281 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:253 +#: lib/psm.c:271 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d omplasser %s -> %s\n" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "ekskluderer multilib-sti %s%s\n" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "eksluderer %s %s\n" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "relokerer %s til %s\n" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "relokerer katalog %s til %s\n" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, c-format msgid "cannot create %%%s %s\n" msgstr "kan ikke opprette %%%s %s\n" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, c-format msgid "cannot write to %%%s %s\n" msgstr "kan ikke skrive til %%%s %s\n" -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binær funnet\n" -#: lib/psm.c:1287 +#: lib/psm.c:1314 msgid "source package contains no .spec file\n" msgstr "kildepakke inneholder ikke en .spec-fil\n" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: kjører %s-skript (hvis noen)\n" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1572 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1919 +#: lib/psm.c:1946 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr "" -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "klarte ikke å åpne %s: %s\n" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s feilet\n" @@ -2846,13 +2846,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer katalog %s\n" diff --git a/po/pl.po b/po/pl.po index 4e052b6..8a83cd3 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -852,7 +852,7 @@ msgstr "Nie mo msgid "Could not open %s: %s\n" msgstr "Nie mo¿na otworzyæ %s\n" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nie mo¿na zapisaæ pakietu: %s" @@ -882,7 +882,7 @@ msgstr "Nie mo msgid "Unable to write payload to %s: %s\n" msgstr "Nie mo¿na zapisaæ pakietu: %s" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -1478,11 +1478,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 #, fuzzy msgid "NO " msgstr "NIE DOBRZE" @@ -1492,57 +1492,57 @@ msgstr "NIE DOBRZE" msgid "cannot open Packages database in %s\n" msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:883 +#: lib/depends.c:882 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:934 +#: lib/depends.c:933 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" @@ -1550,42 +1550,42 @@ msgstr "plik %s nie nale #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, 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:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "pakiet %s jest w konflikcie: %s\n" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "usuwanie indeksu grupy\n" #. Record all relations. -#: lib/depends.c:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1689,7 +1689,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabData() RPM_STRING_TYPE licznik musi byæ 1.\n" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "Typ danych %d nie jest obs³ugiwany\n" @@ -2244,177 +2244,177 @@ msgstr "podpisz pakiet (porzu msgid "generate signature" msgstr "generuj sygnaturê PGP/GPG" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " jest wymagany przez %s-%s-%s\n" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " jest w konflikcie z %s-%s-%s\n" -#: lib/problems.c:293 +#: lib/problems.c:251 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "pakiet %s-%s-%s zbudowano dla innej architektury" -#: lib/problems.c:298 +#: lib/problems.c:256 #, fuzzy, c-format msgid "package %s is for a different operating system" msgstr "pakiet %s-%s-%s zbudowano dla innego systemu operacyjnego" -#: lib/problems.c:303 +#: lib/problems.c:261 #, fuzzy, c-format msgid "package %s is already installed" msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany" -#: lib/problems.c:308 +#: lib/problems.c:266 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "pakiet %s nie jest przesuwalny\n" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:276 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" "plik %s z pakietu %s-%s-%s jest w konflikcie z plikiem z pakietu %s-%s-%s" -#: lib/problems.c:323 +#: lib/problems.c:281 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" "pakiet %s-%s-%s (który jest nowszy ni¿ %s-%s-%s) jest ju¿ zainstalowany" -#: lib/problems.c:328 +#: lib/problems.c:286 #, fuzzy, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "instalacja pakietu %s-%s-%s wymaga %ld%c w systemie plików %s" -#: lib/problems.c:338 +#: lib/problems.c:296 #, fuzzy, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "instalacja pakietu %s-%s-%s wymaga %ld%c w systemie plików %s" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:350 +#: lib/problems.c:308 #, fuzzy, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "wyst±pi³ nieznany b³±d %d w trakcie manipulowania pakietem %s-%s-%s" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:250 +#: lib/psm.c:268 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "Ten OS nie jest wspierany: %s" -#: lib/psm.c:253 +#: lib/psm.c:271 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "przesuwanie %s do %s\n" -#: lib/psm.c:323 +#: lib/psm.c:341 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "wy³±czanie %s\n" -#: lib/psm.c:389 +#: lib/psm.c:407 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "wy³±czanie %s\n" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "przesuwanie %s do %s\n" -#: lib/psm.c:478 +#: lib/psm.c:496 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "przesuwanie %s do %s\n" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "nie mo¿na utworzyæ %s" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "nie mo¿na zapisaæ do %s" -#: lib/psm.c:1173 +#: lib/psm.c:1191 #, fuzzy msgid "source package expected, binary found\n" msgstr "spodziewany pakiet ¼ród³owy a nie binarny" -#: lib/psm.c:1287 +#: lib/psm.c:1314 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pakiet ¼ród³owy nie zawiera pliku .spec" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, 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:1572 +#: lib/psm.c:1599 #, 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:1919 +#: lib/psm.c:1946 #, 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:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, 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:2160 +#: lib/psm.c:2186 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s nie istnieje - u¿yto grupy root" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, 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:2202 +#: lib/psm.c:2228 msgid " on file " msgstr " na pliku " -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nie mo¿na otworzyæ %s: %s" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s nie powiod³o siê" @@ -2945,13 +2945,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Blok sygnatury: %d\n" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s pominiêty z powodu flagi missingok\n" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "tworzenie katalogu: %s\n" diff --git a/po/pt.po b/po/pt.po index 766c2a7..ad28b7b 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: 2000-06-22 01:13+01:00\n" "Last-Translator: José Nuno Coelho Sanarra Pires\n" "Language-Team: pt \n" @@ -823,7 +823,7 @@ msgstr "N msgid "Could not open %s: %s\n" msgstr "Não consigo aceder ao %s: %s\n" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, c-format msgid "Unable to write package: %s\n" msgstr "Não consegui gravar o pacote: %s\n" @@ -853,7 +853,7 @@ msgstr "N msgid "Unable to write payload to %s: %s\n" msgstr "Não consegui escrever o conteúdo de %s: %s\n" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "Gravei: %s\n" @@ -1435,11 +1435,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 #, fuzzy msgid "NO " msgstr "NÃO-OK" @@ -1449,57 +1449,57 @@ msgstr "N msgid "cannot open Packages database in %s\n" msgstr "não consigo abrir a base de dados Packages em %s\n" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "o pacote %s já está instalado" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-3s (em cache)\n" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s SIM (oferecidos pelo rpmrc)\n" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s SIM (oferecidos pela rpmlib)\n" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s SIM (ficheiros db)\n" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s SI (oferecidos pelo db)\n" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s SIM (pacote db)\n" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NÃO\n" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) adicionado à cache de dependências.\n" @@ -1507,42 +1507,42 @@ msgstr "%s: (%s, %s) adicionado #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, 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:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "o pacote %s está em conflito: %s\n" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, 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:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "=========== a guardar as relações do tsort\n" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "========== só os sucessores (ordem de apresentação)\n" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "CICLO:\n" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "========== a prosseguir o tsort ...\n" @@ -1645,7 +1645,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "o valor RPM_STRING_TYPE do dataLength() tem de ser 1.\n" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "O tipo de dados %d não é suportado\n" @@ -2176,173 +2176,173 @@ msgstr "assinar um pacote (retira a assinatura actual)" msgid "generate signature" msgstr "gerar a assinatura PGP/GPG" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " é necessário pelo %s-%s-%s\n" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " está em conflito com o %s-%s-%s\n" -#: lib/problems.c:293 +#: lib/problems.c:251 #, c-format msgid "package %s is for a different architecture" msgstr "o pacote %s é para uma arquitectura diferente" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "o pacote %s é para um sistema operativo diferente" -#: lib/problems.c:303 +#: lib/problems.c:261 #, c-format msgid "package %s is already installed" msgstr "o pacote %s já está instalado" -#: lib/problems.c:308 +#: lib/problems.c:266 #, c-format msgid "path %s in package %s is not relocateable" msgstr "a directoria %s no pacote %s não pode ser mudada de sítio" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "o ficheiro %s está em conflito com as tentativas de instalação do %s e %s" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "o ficheiro %s da instalação do %s está em conflito com o ficheiro do pacote %s" -#: lib/problems.c:323 +#: lib/problems.c:281 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "o pacote %s (que é mais recente que o %s) já está instalado" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "a instalação do pacote %s precisa de %ld%cb no sistema de ficheiros %s" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "a instalação do pacote %s precisa de %ld 'inodes' no sistema de ficheiros %s" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "a(s) chamada(s) de pré-transacção do pacote %s: %s falhou: %s" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "encontrado o erro desconhecido %d ao manipular o pacote %s" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "========== mudanças de local\n" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "%5d excluir o %s\n" -#: lib/psm.c:253 +#: lib/psm.c:271 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d mudar de local %s -> %s\n" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "a exclur a directoria 'multilib' %s%s\n" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "a excluir o %s %s\n" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "a mudar o %s para %s\n" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "a mudar a directoria %s para %s\n" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "não consigo criar o %s: %s\n" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "não consigo escrever em %s\n" -#: lib/psm.c:1173 +#: lib/psm.c:1191 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:1287 +#: lib/psm.c:1314 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:1397 +#: lib/psm.c:1424 #, 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:1565 +#: lib/psm.c:1592 #, 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:1572 +#: lib/psm.c:1599 #, 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:1919 +#: lib/psm.c:1946 #, 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:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, 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:2160 +#: lib/psm.c:2186 #, 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:2201 +#: lib/psm.c:2227 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "a abertura do pacote falhou%s%s: %s\n" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr " no ficheiro " -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "falhei ao aceder ao %s: %s\n" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "O %s falhou\n" @@ -2859,13 +2859,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "'Pad' ou preenchimento da assinatura: %d\n" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ignorado devido à opção missingok\n" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "a excluir a directoria %s\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index a1bd182..447bd79 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" #: build.c:36 #, fuzzy @@ -911,7 +911,7 @@ msgid "Could not open %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "No consegui abrir: %s\n" @@ -946,7 +946,7 @@ msgstr "No consegui abrir: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "No consegui abrir: %s\n" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1590,11 +1590,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "" @@ -1604,57 +1604,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "No consegui abrir: %s\n" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "no foi passado pacote para instalao" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1662,42 +1662,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, 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:1123 +#: lib/depends.c:1122 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "no foi passado pacote para desinstalao" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1805,7 +1805,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2370,72 +2370,72 @@ msgstr "assine um pacote (descarte a assinatura corrente)" msgid "generate signature" msgstr "gere assinatura PGP" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:251 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:298 +#: lib/problems.c:256 #, fuzzy, c-format msgid "package %s is for a different operating system" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:303 +#: lib/problems.c:261 #, fuzzy, c-format msgid "package %s is already installed" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:308 +#: lib/problems.c:266 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:323 +#: lib/problems.c:281 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" @@ -2447,13 +2447,13 @@ msgstr "" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/psm.c:250 +#: lib/psm.c:268 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "RPM verso %s\n" # , c-format -#: lib/psm.c:253 +#: lib/psm.c:271 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "No consegui abrir: %s\n" @@ -2466,7 +2466,7 @@ msgstr "No consegui abrir: %s\n" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/psm.c:323 +#: lib/psm.c:341 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "RPM verso %s\n" @@ -2479,94 +2479,94 @@ msgstr "RPM verso %s\n" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/psm.c:389 +#: lib/psm.c:407 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "RPM verso %s\n" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" # , c-format -#: lib/psm.c:478 +#: lib/psm.c:496 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1287 +#: lib/psm.c:1314 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pesquise o pacote ao qual pertence" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "no execute nenhum estgio" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1572 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1919 +#: lib/psm.c:1946 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "no foi passado pacote para instalao" -#: lib/psm.c:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "Construo falhou.\n" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "Construo falhou.\n" @@ -3125,7 +3125,7 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3139,7 +3139,7 @@ msgstr "" # "Content-Transfer-Encoding: 8-bit\n" # , c-format #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "RPM verso %s\n" diff --git a/po/ro.po b/po/ro.po index 3965138..65e3b33 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -811,7 +811,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -841,7 +841,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1418,11 +1418,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "" @@ -1431,57 +1431,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1489,42 +1489,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1625,7 +1625,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2132,173 +2132,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:251 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:261 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:308 +#: lib/problems.c:266 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:323 +#: lib/problems.c:281 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:253 +#: lib/psm.c:271 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1287 +#: lib/psm.c:1314 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1572 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1919 +#: lib/psm.c:1946 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr "" -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2812,13 +2812,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index 0adfefd..2471c88 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-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,42 +1494,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1630,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2137,173 +2137,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:251 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:261 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:308 +#: lib/problems.c:266 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:323 +#: lib/problems.c:281 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:253 +#: lib/psm.c:271 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1287 +#: lib/psm.c:1314 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1572 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1919 +#: lib/psm.c:1946 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr "" -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2817,13 +2817,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index a84855d..957ed27 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: 2001-08-29 13:55-0400\n" "Last-Translator: Eugene Kanter \n" "Language-Team: Black Cat Linux Team \n" @@ -834,7 +834,7 @@ msgstr " msgid "Could not open %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, c-format msgid "Unable to write package: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÐÁËÅÔ: %s\n" @@ -864,7 +864,7 @@ msgstr " msgid "Unable to write payload to %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÓÏÄÅÒÖÉÍÏÅ × %s: %s\n" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "úÁÐÉÓÁÎ: %s\n" @@ -1456,11 +1456,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "äá" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "îåT" @@ -1469,57 +1469,57 @@ msgstr " msgid "cannot open Packages database in %s\n" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "ÐÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-s (cached)\n" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s YES (rpmrc provides)\n" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s YES (rpmlib provides)\n" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s YES (db files)\n" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s YES (db provides)\n" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s YES (db package)\n" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NO\n" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) ÄÏÂÁ×ÌÅÎÏ × ËÅÛ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" @@ -1527,44 +1527,44 @@ msgstr "%s: (%s, %s) #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n" #. conflicts exist. -#: lib/depends.c:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "ÐÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó: %s\n" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n" #. Record all relations. -#: lib/depends.c:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "========== ÚÁÐÉÓØ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== ÓÏÒÔÉÒÏ×ËÁ ÐÁËÅÔÏ× (ÏÞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, " "ÇÌÕÂÉÎÁ)\n" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "========== ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌÉ (× ÐÏÒÑÄËÅ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ)\n" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "ãéëì:\n" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "========== ÐÒÏÄÏÌÖÅÎÉÅ ÕÐÏÒÑÄÏÞÅÎÉÑ ...\n" @@ -1668,7 +1668,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() ÄÏÐÕÓÔÉÍ ÔÏÌØËÏ ÏÄÉÎ ÜÌÅÍÅÎÔ ÔÉÐÁ RPM_STRING_TYPE\n" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "ôÉÐ ÄÁÎÎÙÈ %d ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n" @@ -2192,173 +2192,173 @@ msgstr " msgid "generate signature" msgstr "ÇÅÎÅÒÉÒÏ×ÁÔØ ÐÏÄÐÉÓØ" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " ÎÕÖÅÎ ÄÌÑ %s-%s-%s\n" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " ËÏÎÆÌÉËÔÕÅÔ Ó %s-%s-%s\n" -#: lib/problems.c:293 +#: lib/problems.c:251 #, c-format msgid "package %s is for a different architecture" msgstr "ÐÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÁÒÈÉÔÅËÔÕÒÙ" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "ÐÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ" -#: lib/problems.c:303 +#: lib/problems.c:261 #, c-format msgid "package %s is already installed" msgstr "ÐÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/problems.c:308 +#: lib/problems.c:266 #, c-format msgid "path %s in package %s is not relocateable" msgstr "ÐÕÔØ %s × ÐÁËÅÔÅ %s - ÎÅ ÐÅÒÅÍÅÝÁÅÍÙÊ" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "ËÏÎÆÌÉËÔ ÆÁÊÌÁ %s ÐÒÉ ÐÏÐÙÔËÁÈ ÕÓÔÁÎÏ×ËÉ %s É %s" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "ÆÁÊÌ %s ÉÚ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ ÐÁËÅÔÁ %s ËÏÎÆÌÉËÔÕÅÔ Ó ÆÁÊÌÏÍ ÉÚ ÐÁËÅÔÁ %s" -#: lib/problems.c:323 +#: lib/problems.c:281 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "ÐÁËÅÔ %s (ËÏÔÏÒÙÊ ÎÏ×ÅÅ, ÞÅÍ %s) ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ %s ÎÕÖÎÏ %ld%cb ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ %s ÎÕÖÎÏ %ld inodes ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "ÐÁËÅÔ %s pre-transaction syscall(s): %s: ÏÛÉÂËÁ: %s" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ %d ÐÒÉ ÒÁÂÏÔÅ Ó ÐÁËÅÔÏÍ %s" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "========== ÐÅÒÅÍÅÝÅÎÉÊ\n" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "%5d ÉÓËÌÀÞÅÎ %s\n" -#: lib/psm.c:253 +#: lib/psm.c:271 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d ÐÅÒÅÍÅÝÅÎÉÅ %s -> %s\n" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "ÉÓËÌÀÞÁÅÔÓÑ ÍÎÏÇÏÂÉÂÌÉÏÔÅÞÎÙÊ ÐÕÔØ %s%s\n" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "ÉÓËÌÀÞÁÅÔÓÑ %s %s\n" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "ÐÅÒÅÍÅÝÁÅÔÓÑ %s × %s\n" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "ÐÅÒÅÍÅÝÁÅÔÓÑ ËÁÔÁÌÏÇ %s × %s\n" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, c-format msgid "cannot create %%%s %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %%%s %s\n" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, c-format msgid "cannot write to %%%s %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÉÓÁÔØ × %%%s %s\n" -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "ÏÂÎÁÒÕÖÅÎ Ä×ÏÉÞÎÙÊ ÐÁËÅÔ ×ÍÅÓÔÏ ÏÖÉÄÁÅÍÏÇÏ ÉÓÈÏÄÎÏÇÏ\n" -#: lib/psm.c:1287 +#: lib/psm.c:1314 msgid "source package contains no .spec file\n" msgstr "ÉÓÈÏÄÎÙÊ ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ\n" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: ×ÙÐÏÌÎÑÅÔÓÑ ÓÃÅÎÁÒÉÊ %s (ÅÓÌÉ ÅÓÔØ)\n" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, 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:1572 +#: lib/psm.c:1599 #, 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:1919 +#: lib/psm.c:1946 #, 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:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "%s: ÏÛÉÂËÁ ÓÃÅÎÁÒÉÑ %s (%d), %s-%s-%s ÐÒÏÐÕÓËÁÅÔÓÑ\n" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "ÐÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "ÇÒÕÐÐÁ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "ÒÁÓÐÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s\n" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr " ÎÁ ÆÁÊÌÅ " -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ÏÛÉÂËÁ ÎÁ ÆÁÊÌÅ %s: %s\n" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, c-format msgid "%s failed: %s\n" msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n" @@ -2876,13 +2876,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "ðÏÄÐÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁÐÏÌÎÅÎÉÅ(%d)\n" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ÐÒÏÐÕÝÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "ÉÓËÌÀÞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n" diff --git a/po/sk.po b/po/sk.po index c8df703..7645967 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -850,7 +850,7 @@ msgstr "Nie je mo msgid "Could not open %s: %s\n" msgstr "Otvorenie %s zlyhalo\n" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nie je mo¾né zapísa» balík: %s" @@ -880,7 +880,7 @@ msgstr "Nie je mo msgid "Unable to write payload to %s: %s\n" msgstr "Nie je mo¾né zapísa» balík: %s" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "Zapísané: %s\n" @@ -1477,11 +1477,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 #, fuzzy msgid "NO " msgstr "NIE JE V PORIADKU" @@ -1491,57 +1491,57 @@ msgstr "NIE JE V PORIADKU" msgid "cannot open Packages database in %s\n" msgstr "nie je mo¾né otvori» %s/packages.rpm\n" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:883 +#: lib/depends.c:882 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:934 +#: lib/depends.c:933 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" @@ -1549,42 +1549,42 @@ msgstr "s #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, 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:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "balík %s koliduje: %s\n" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, 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:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1688,7 +1688,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabData() RPM_STRING_TYPE poèet musí by» 1.\n" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "Typ údajov %d nie je podorovaný\n" @@ -2243,175 +2243,175 @@ msgstr "podp msgid "generate signature" msgstr "vytvori» PGP/GPG podpis" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " je vy¾adované %s-%s-%s\n" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " koliduje s %s-%s-%s\n" -#: lib/problems.c:293 +#: lib/problems.c:251 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:261 #, fuzzy, c-format msgid "package %s is already installed" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/problems.c:308 +#: lib/problems.c:266 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:323 +#: lib/problems.c:281 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:250 +#: lib/psm.c:268 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "OS je vynechaný: %s" -#: lib/psm.c:253 +#: lib/psm.c:271 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "presúva sa %s do %s\n" -#: lib/psm.c:323 +#: lib/psm.c:341 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "vynecháva sa %s\n" -#: lib/psm.c:389 +#: lib/psm.c:407 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "vynecháva sa %s\n" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "presúva sa %s do %s\n" -#: lib/psm.c:478 +#: lib/psm.c:496 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "presúva sa %s do %s\n" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "nie je mo¾né zapísa» do %s: " -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "nie je mo¾né zapísa» do %s: " -#: lib/psm.c:1173 +#: lib/psm.c:1191 #, fuzzy msgid "source package expected, binary found\n" msgstr "oèakávaný zdrojový balík, nájdený binárny" -#: lib/psm.c:1287 +#: lib/psm.c:1314 #, fuzzy msgid "source package contains no .spec file\n" msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "vykonanie skriptu zlyhalo" -#: lib/psm.c:1572 +#: lib/psm.c:1599 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "vykonanie skriptu zlyhalo" -#: lib/psm.c:1919 +#: lib/psm.c:1946 #, 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:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "pou¾ívateµ %s neexistuje - pou¾ije sa root" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ije sa root" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalenie archívu zlyhalo%s%s: %s" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr " pre súbor " -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nepodarilo sa otvori» %s: %s" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s zlyhalo" @@ -2942,13 +2942,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Doplnenie podpisu: %d\n" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s vynechané kvôli príznaku missingok\n" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "vytvára sa adresár %s\n" diff --git a/po/sl.po b/po/sl.po index 4fcaed0..48cd6e7 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,12 +1,12 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primo¾ Peterlin , 2000. -# $Id: sl.po,v 1.179 2001/10/29 23:40:24 jbj Exp $ +# $Id: sl.po,v 1.180 2001/10/30 18:00:33 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -848,7 +848,7 @@ msgstr "Ikone %s ni mo msgid "Could not open %s: %s\n" msgstr "Ni mo¾no odpreti %s: %s\n" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Ni mo¾no zapisati paketa: %s" @@ -878,7 +878,7 @@ msgstr "Ikone %s ni mo msgid "Unable to write payload to %s: %s\n" msgstr "Ni mo¾no zapisati paketa %s: %s" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -1480,11 +1480,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 #, fuzzy msgid "NO " msgstr "NI DOBRO" @@ -1494,57 +1494,57 @@ msgstr "NI DOBRO" msgid "cannot open Packages database in %s\n" msgstr "zbirko podatkov paketov ni mo¾no odpreti v %s\n" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paket %s-%s-%s je ¾e name¹èen" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-3s (predpomnjeno)\n" -#: lib/depends.c:866 +#: lib/depends.c:865 #, fuzzy, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s DA (rpmrc ponudbe)\n" -#: lib/depends.c:883 +#: lib/depends.c:882 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s DA (rpmlib ponudbe)\n" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s DA (db datoteke)\n" -#: lib/depends.c:920 +#: lib/depends.c:919 #, fuzzy, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s DA (db ponudbe)\n" -#: lib/depends.c:934 +#: lib/depends.c:933 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %s zadovoljen ob paketih db.\n" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NE\n" -#: lib/depends.c:971 +#: lib/depends.c:970 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n" @@ -1552,42 +1552,42 @@ msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, 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:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "paket %s jw v sporu z: %s\n" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, fuzzy, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "odstranjujemo seznam skupin\n" #. Record all relations. -#: lib/depends.c:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1691,7 +1691,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "¹tevec grabData() RPM_STRING_TYPE mora biti 1.\n" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "Tip podatkov %d ni podprt\n" @@ -2243,176 +2243,176 @@ msgstr "podpi msgid "generate signature" msgstr "izdelava podpisa PGP/GPG" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " potrebuje %s-%s-%s\n" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " je v sporu z %s-%s-%s\n" -#: lib/problems.c:293 +#: lib/problems.c:251 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "paket %s-%s-%s je za drug tip arhitekture" -#: lib/problems.c:298 +#: lib/problems.c:256 #, fuzzy, c-format msgid "package %s is for a different operating system" msgstr "paket %s-%s-%s je za drug operacijski sistem" -#: lib/problems.c:303 +#: lib/problems.c:261 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paket %s-%s-%s je ¾e name¹èen" -#: lib/problems.c:308 +#: lib/problems.c:266 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paketa %s ni mo¾no prestaviti\n" -#: lib/problems.c:313 +#: lib/problems.c:271 #, fuzzy, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "datoteka %s je v sporu med poskusom namestitve %s in %s" -#: lib/problems.c:318 +#: lib/problems.c:276 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" "datoteka %s name¹èena z %s-%s-%s je v sporu z datoteko iz paketa %s-%s-%s" -#: lib/problems.c:323 +#: lib/problems.c:281 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "paket %s-%s-%s (ki je novej¹i kot %s-%s-%s) je ¾e name¹èen" -#: lib/problems.c:328 +#: lib/problems.c:286 #, fuzzy, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "namestitev paketa %s-%s-%s zahteva %ld%cb na datoteènem sistemu %s" -#: lib/problems.c:338 +#: lib/problems.c:296 #, fuzzy, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "paket %s pred-prenosljivih sistemskih klicov: %s ni uspelo: %s" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:350 +#: lib/problems.c:308 #, fuzzy, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "neznana napaka %d ob rokovanju s paketom %s-%s-%s" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:250 +#: lib/psm.c:268 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "OS je izkljuèen: %s" -#: lib/psm.c:253 +#: lib/psm.c:271 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "premikanje %s v %s\n" -#: lib/psm.c:323 +#: lib/psm.c:341 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "izkljuèevanje datoteke %s%s\n" -#: lib/psm.c:389 +#: lib/psm.c:407 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "izkljuèevanje datoteke %s%s\n" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "premikanje %s v %s\n" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "premiokanje imenika %s v %s\n" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "ni mo¾no ustvariti %s: %s\n" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "pisanje na %s ni mo¾no" -#: lib/psm.c:1173 +#: lib/psm.c:1191 #, fuzzy msgid "source package expected, binary found\n" msgstr "prièakovan je bil izvorni paket, najden binarni" -#: lib/psm.c:1287 +#: lib/psm.c:1314 #, fuzzy msgid "source package contains no .spec file\n" msgstr "izvorni paket ne vsebuje datoteke .spec" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "poganjanje ponamestitvenih skript (èe obstajajo)\n" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, 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:1572 +#: lib/psm.c:1599 #, 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:1919 +#: lib/psm.c:1946 #, 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:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "uporabnik %s ne obstaja - uporabljam root" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s ne obstaja - uporabljam root" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, 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:2202 +#: lib/psm.c:2228 msgid " on file " msgstr " za datoteko " -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspe¹no odpiranje %s: %s\n" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s neuspe¹en" @@ -2940,13 +2940,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Dol¾. polnila : %d\n" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s preskoèen zaradi manjkajoèe zastavice OK\n" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "izkljuèevanje imenika %s\n" diff --git a/po/sr.po b/po/sr.po index 0ce572b..5995fa0 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" @@ -833,7 +833,7 @@ msgstr "Ne mogu da upi msgid "Could not open %s: %s\n" msgstr "neuspelo otvaranje %s\n" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Ne mogu da upi¹em %s" @@ -863,7 +863,7 @@ msgstr "Ne mogu da upi msgid "Unable to write payload to %s: %s\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1462,11 +1462,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "" @@ -1475,57 +1475,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paket %s nije instaliran\n" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, fuzzy, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:883 +#: lib/depends.c:882 #, fuzzy, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:934 +#: lib/depends.c:933 #, fuzzy, c-format msgid "%s: %-45s YES (db package)\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, fuzzy, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "datoteka %s ne pripada nijednom paketu\n" @@ -1533,42 +1533,42 @@ msgstr "datoteka %s ne pripada nijednom paketu\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, 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:1123 +#: lib/depends.c:1122 #, fuzzy, c-format msgid "package %s conflicts: %s\n" msgstr "paket %s nije naveden u %s" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, 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:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1671,7 +1671,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2229,174 +2229,174 @@ msgstr "potpi msgid "generate signature" msgstr "napravi PGP potpis" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " je potreban paketu %s-%s-%s\n" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " se sudara sa %s-%s-%s\n" -#: lib/problems.c:293 +#: lib/problems.c:251 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/problems.c:298 +#: lib/problems.c:256 #, fuzzy, c-format msgid "package %s is for a different operating system" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/problems.c:303 +#: lib/problems.c:261 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paket %s nije instaliran\n" -#: lib/problems.c:308 +#: lib/problems.c:266 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paket %s nije instaliran\n" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:276 #, fuzzy, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr " se sudara sa %s-%s-%s\n" -#: lib/problems.c:323 +#: lib/problems.c:281 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:343 +#: lib/problems.c:301 #, fuzzy, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:250 +#: lib/psm.c:268 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "Pribavljam %s\n" -#: lib/psm.c:253 +#: lib/psm.c:271 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/psm.c:323 +#: lib/psm.c:341 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "Pribavljam %s\n" -#: lib/psm.c:389 +#: lib/psm.c:407 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "Pribavljam %s\n" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:478 +#: lib/psm.c:496 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1287 +#: lib/psm.c:1314 #, fuzzy msgid "source package contains no .spec file\n" msgstr "upit nad paketom koji ima " -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "nemoj izvr¹iti nijednu fazu" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, 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:1572 +#: lib/psm.c:1599 #, 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:1919 +#: lib/psm.c:1946 #, 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:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr "" -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "PGP omanuo" @@ -2931,13 +2931,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" diff --git a/po/sv.po b/po/sv.po index 534b122..2a86f3a 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: 2001-09-12 14:18+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -825,7 +825,7 @@ msgstr "Kan inte l msgid "Could not open %s: %s\n" msgstr "Kunde inte öppna %s: %s\n" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunde inte skriva paket: %s\n" @@ -855,7 +855,7 @@ msgstr "Kan inte l msgid "Unable to write payload to %s: %s\n" msgstr "Kan inte skriva last till %s: %s\n" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1441,11 +1441,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "JA" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "NEJ " @@ -1454,57 +1454,57 @@ msgstr "NEJ " msgid "cannot open Packages database in %s\n" msgstr "kan inte öppna paketdatabas i %s\n" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paket %s är redan installerat" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-s (cachad)\n" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s JA (rpmlib tillhandahåller)\n" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s JA (db-filer)\n" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s JA (db-tillhandahållande)\n" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s JA (db-paket)\n" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s NEJ\n" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) tillagt till beroendecachen.\n" @@ -1512,43 +1512,43 @@ msgstr "%s: (%s, %s) tillagt till beroendecachen.\n" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, 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:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "paket %s står i konflikt: %s\n" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, 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:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "========== noterar alla relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== tsort:erar paket (ordning, #föregångare, #efterföljare, djup)\n" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "========== endast efterföljare (presentationsordning)\n" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "LOOP:\n" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "========== fortsätter med tsort ...\n" @@ -1652,7 +1652,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE antal måste vara 1.\n" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "Datatyp %d stöds inte\n" @@ -2175,174 +2175,174 @@ msgstr "signera ett paket (sl msgid "generate signature" msgstr "generera signatur" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " behövs av %s-%s-%s\n" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " står i konflikt med %s-%s-%s\n" -#: lib/problems.c:293 +#: lib/problems.c:251 #, c-format msgid "package %s is for a different architecture" msgstr "paket %s är för en annan arkitektur" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "paket %s är för ett annat operativsystem" -#: lib/problems.c:303 +#: lib/problems.c:261 #, c-format msgid "package %s is already installed" msgstr "paket %s är redan installerat" -#: lib/problems.c:308 +#: lib/problems.c:266 #, c-format msgid "path %s in package %s is not relocateable" msgstr "sökväg %s i paket %s är inte relokerbar" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "fil %s är en konflikt mellan installationsförsök av %s och %s" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "fil %s från installation av %s står i konflikt med filen från paket %s" -#: lib/problems.c:323 +#: lib/problems.c:281 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "paket %s (som är nyare än %s) är redan installerat" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "installation av paket %s kräver %ld%cB på filsystem %s" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "installation av paket %s kräver %ld inoder på filsystem %s" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "paket %s systemanrop före transaktion: %s misslyckades: %s" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "okänt fel %d uppträdde under behandling av paket %s" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "========== omflyttningar\n" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "%5d utesluter %s\n" -#: lib/psm.c:253 +#: lib/psm.c:271 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d flyttar om %s -> %s\n" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "hoppar över multilib-sökväg %s%s\n" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "hoppar över %s %s\n" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "flyttar %s till %s\n" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "flyttar katalogen %s till %s\n" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, c-format msgid "cannot create %%%s %s\n" msgstr "kan inte skapa %%%s %s\n" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, c-format msgid "cannot write to %%%s %s\n" msgstr "kan inte skriva till %%%s %s\n" -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "källpaket förväntades, fann binärpaket\n" -#: lib/psm.c:1287 +#: lib/psm.c:1314 msgid "source package contains no .spec file\n" msgstr "källpaket innehåller ingen .spec-fil\n" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: kör (eventuellt) %s-skript\n" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, 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:1572 +#: lib/psm.c:1599 #, 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:1919 +#: lib/psm.c:1946 #, 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:2036 +#: lib/psm.c:2063 #, 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:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "användare %s finns inte - använder root\n" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "grupp %s finns inte - använder root\n" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "uppackning av arkiv misslyckades%s%s: %s\n" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr " vid fil " -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s misslyckades på fil %s: %s\n" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, c-format msgid "%s failed: %s\n" msgstr "%s misslyckades: %s\n" @@ -2861,13 +2861,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s överhoppad på grund av missingok-flagga\n" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "hoppar över katalogen %s\n" diff --git a/po/tr.po b/po/tr.po index e96a002..3b5870e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -836,7 +836,7 @@ msgstr "%s'den ba msgid "Could not open %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, c-format msgid "Unable to write package: %s\n" msgstr "paket yazýlamadý: %s\n" @@ -866,7 +866,7 @@ msgstr "%s'den payload okunamad msgid "Unable to write payload to %s: %s\n" msgstr "%s'e payload yazýlamadý: %s\n" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "Yazýldý: %s\n" @@ -1461,11 +1461,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "EVET" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "HAYIR " @@ -1474,57 +1474,57 @@ msgstr "HAYIR " msgid "cannot open Packages database in %s\n" msgstr "%s de Paket veritabaný açýlamadý\n" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "%s zaten kurulu" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "%s: %-45s %-s (arabellekli)\n" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "%s: %-45s EVET (rpmrc saðlar)\n" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "%s: %-45s EVET (rpmlib saðlar)\n" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "%s: %-45s EVET (db dosyalarý)\n" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "%s: %-45s EVET (db saðlar)\n" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "%s: %-45s EVET (db paketi)\n" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "%s: %-45s HAYIR\n" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) Baðýmlýlar alanýna eklendi.\n" @@ -1532,43 +1532,43 @@ msgstr "%s: (%s, %s) Ba #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, 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:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "%s paketi çeliþiyor: %s\n" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, 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:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "========== tsort baðýntýlarý kaydediliyor\n" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== paketler tsort'lanýyor (sýra, #öncüller, #ardýllar, derinlik)\n" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "========== sadece ardýllar (sunum sýrasý)\n" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "ÇEVRÝM:\n" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "========== tsort sürüyor ...\n" @@ -1672,7 +1672,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE sayýsý 1 olmalý.\n" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "%d veri türü desteklenmiyor\n" @@ -2199,173 +2199,173 @@ msgstr "paketi imzalar (mevcut imza kald msgid "generate signature" msgstr "imza üretir" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr " %s-%s-%s için gerekli\n" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr " %s-%s-%s ile çeliþiyor\n" -#: lib/problems.c:293 +#: lib/problems.c:251 #, c-format msgid "package %s is for a different architecture" msgstr "%s farklý bir mimari için" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "%s farklý bir iþletim sistemi için" -#: lib/problems.c:303 +#: lib/problems.c:261 #, c-format msgid "package %s is already installed" msgstr "%s zaten kurulu" -#: lib/problems.c:308 +#: lib/problems.c:266 #, c-format msgid "path %s in package %s is not relocateable" msgstr "%s dosya yolu %s paketinde yeniden konumlandýrýlamaz" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "%s dosyasý kalkýþýlan %s ve %s kurulumlarý arasýnda çeliþiyor" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "%s dosyasýnýn %s kurulumu %s kurulumundaki dosya ile çeliþiyor" -#: lib/problems.c:323 +#: lib/problems.c:281 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "%s paketi zaten yüklü (%s sürümünden daha yeni)" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "%s kurulumu %ld%cb gerektiriyor (%s dosya sisteminde)" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "%s kurulumu %ld i-düðüm gerektiriyor (%s dosya sisteminde)" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "%s iþlem öncesi sistem çaðrý(sý/larý): %s baþarýsýz: %s" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "anlaþýlamayan %d hatasý, %s paketi iþlenirken saptandý" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "========== yeniden konumlama\n" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "%5d %s'i dýþlýyor\n" -#: lib/psm.c:253 +#: lib/psm.c:271 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d yeniden konumlandýrýlýyor: %s -> %s\n" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "multilib dosya yolu dýþlanýyor %s%s\n" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "%s %s dýþlanýyor\n" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "%s %s'e konumlanýyor\n" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "%s dizini %s de yeniden konumlanýyor\n" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, c-format msgid "cannot create %%%s %s\n" msgstr "%%%s dosyasý oluþturulamýyor: %s\n" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, c-format msgid "cannot write to %%%s %s\n" msgstr "%%%s dosyasýna yazýlamaz %s\n" -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "kaynak paketi gerekirken çalýþtýrýlabilir paketi bulundu\n" -#: lib/psm.c:1287 +#: lib/psm.c:1314 msgid "source package contains no .spec file\n" msgstr "kaynak paketi .spec dosyasý içermiyor\n" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: %s betiði çalýþtýrýlýyor (varsa)\n" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, 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:1572 +#: lib/psm.c:1599 #, 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:1919 +#: lib/psm.c:1946 #, 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:2036 +#: lib/psm.c:2063 #, 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:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "kullanýcý %s yok - root kullanýlacak\n" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "grup %s yok - root kullanýlacak\n" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, 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:2202 +#: lib/psm.c:2228 msgid " on file " msgstr " dosyada " -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s baþarýsýz\n" @@ -2882,13 +2882,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Ýmza: boyut(%d)+iz(%d)\n" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "missingok flamasýndan dolayý %s atlandý\n" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "%s dizini dýþlanýyor\n" diff --git a/po/uk.po b/po/uk.po index e8ca532..4e5123f 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,42 +1494,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1630,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2137,173 +2137,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:251 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:261 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:308 +#: lib/problems.c:266 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:323 +#: lib/problems.c:281 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:253 +#: lib/psm.c:271 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1287 +#: lib/psm.c:1314 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1572 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1919 +#: lib/psm.c:1946 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr "" -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2817,13 +2817,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/wa.po b/po/wa.po index e8ca532..4e5123f 100644 --- a/po/wa.po +++ b/po/wa.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,42 +1494,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1630,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2137,173 +2137,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:251 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:261 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:308 +#: lib/problems.c:266 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:323 +#: lib/problems.c:281 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:253 +#: lib/psm.c:271 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1287 +#: lib/psm.c:1314 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1572 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1919 +#: lib/psm.c:1946 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr "" -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2817,13 +2817,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/zh.po b/po/zh.po index e8ca532..4e5123f 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-10-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,42 +1494,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1630,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2137,173 +2137,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:251 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:261 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:308 +#: lib/problems.c:266 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:323 +#: lib/problems.c:281 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:253 +#: lib/psm.c:271 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1287 +#: lib/psm.c:1314 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1572 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1919 +#: lib/psm.c:1946 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr "" -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2817,13 +2817,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index e8ca532..4e5123f 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-29 18:24-0500\n" +"POT-Creation-Date: 2001-10-30 12:48-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2114 +#: build/pack.c:603 lib/psm.c:2141 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2380 +#: build/pack.c:683 lib/psm.c:2406 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1423,11 +1423,11 @@ msgstr "" msgid " %s A %s\tB %s\n" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "YES" msgstr "" -#: lib/depends.c:232 lib/depends.c:838 lib/depends.c:971 +#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970 msgid "NO " msgstr "" @@ -1436,57 +1436,57 @@ msgstr "" msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:554 +#: lib/depends.c:553 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:559 +#: lib/depends.c:558 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:564 +#: lib/depends.c:563 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:837 +#: lib/depends.c:836 #, c-format msgid "%s: %-45s %-s (cached)\n" msgstr "" -#: lib/depends.c:866 +#: lib/depends.c:865 #, c-format msgid "%s: %-45s YES (rpmrc provides)\n" msgstr "" -#: lib/depends.c:883 +#: lib/depends.c:882 #, c-format msgid "%s: %-45s YES (rpmlib provides)\n" msgstr "" -#: lib/depends.c:907 +#: lib/depends.c:906 #, c-format msgid "%s: %-45s YES (db files)\n" msgstr "" -#: lib/depends.c:920 +#: lib/depends.c:919 #, c-format msgid "%s: %-45s YES (db provides)\n" msgstr "" -#: lib/depends.c:934 +#: lib/depends.c:933 #, c-format msgid "%s: %-45s YES (db package)\n" msgstr "" -#: lib/depends.c:950 +#: lib/depends.c:949 #, c-format msgid "%s: %-45s NO\n" msgstr "" -#: lib/depends.c:971 +#: lib/depends.c:970 #, c-format msgid "%s: (%s, %s) added to Depends cache.\n" msgstr "" @@ -1494,42 +1494,42 @@ msgstr "" #. requirements are satisfied. #. @switchbreak@ #. requirements are not satisfied. -#: lib/depends.c:1044 +#: lib/depends.c:1043 #, c-format msgid "package %s-%s-%s require not satisfied: %s\n" msgstr "" #. conflicts exist. -#: lib/depends.c:1123 +#: lib/depends.c:1122 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: lib/depends.c:1377 +#: lib/depends.c:1376 #, c-format msgid "removing %s-%s-%s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1533 +#: lib/depends.c:1532 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1598 +#: lib/depends.c:1597 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1650 +#: lib/depends.c:1649 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1711 +#: lib/depends.c:1710 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1741 +#: lib/depends.c:1740 msgid "========== continuing tsort ...\n" msgstr "" @@ -1630,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930 +#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:948 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2137,173 +2137,173 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:250 +#: lib/problems.c:208 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: lib/problems.c:253 +#: lib/problems.c:211 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:251 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:256 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:261 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:308 +#: lib/problems.c:266 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:271 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:276 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:323 +#: lib/problems.c:281 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:328 +#: lib/problems.c:286 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:338 +#: lib/problems.c:296 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:343 +#: lib/problems.c:301 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:350 +#: lib/problems.c:308 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/psm.c:246 +#: lib/psm.c:264 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:250 +#: lib/psm.c:268 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:253 +#: lib/psm.c:271 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:323 +#: lib/psm.c:341 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:389 +#: lib/psm.c:407 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:399 +#: lib/psm.c:417 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:478 +#: lib/psm.c:496 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1127 +#: lib/psm.c:1145 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1133 +#: lib/psm.c:1151 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1173 +#: lib/psm.c:1191 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1287 +#: lib/psm.c:1314 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1397 +#: lib/psm.c:1424 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1565 +#: lib/psm.c:1592 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1572 +#: lib/psm.c:1599 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1919 +#: lib/psm.c:1946 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2036 +#: lib/psm.c:2063 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2151 +#: lib/psm.c:2177 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2160 +#: lib/psm.c:2186 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2201 +#: lib/psm.c:2227 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2202 +#: lib/psm.c:2228 msgid " on file " msgstr "" -#: lib/psm.c:2388 +#: lib/psm.c:2414 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2391 +#: lib/psm.c:2417 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2817,13 +2817,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:238 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:863 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/rpm.spec b/rpm.spec index d732769..2b45e0e 100644 --- a/rpm.spec +++ b/rpm.spec @@ -545,3 +545,4 @@ fi - dump the header early in transaction, recreate fi before installing. - start hiding availablePackage data/methods in rpmal.c/rpmal.h. - add some dinky availablePackage methods. +- transaction.c: cleanly uncouple availablePackage from TFI_t. diff --git a/rpm.spec.in b/rpm.spec.in index cbd4b52..d21af4b 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -545,3 +545,4 @@ fi - dump the header early in transaction, recreate fi before installing. - start hiding availablePackage data/methods in rpmal.c/rpmal.h. - add some dinky availablePackage methods. +- transaction.c: cleanly uncouple availablePackage from TFI_t. -- 2.7.4