From eb10f05b8587e931bd261e99241cac2b8649d4dc Mon Sep 17 00:00:00 2001 From: jbj Date: Thu, 8 Nov 2001 22:04:35 +0000 Subject: - rip out rpmDependencyConflict, replace with rpmProblem instead. CVS patchset: 5162 CVS date: 2001/11/08 22:04:35 --- CHANGES | 1 + build.c | 2 +- lib/depends.c | 70 ++++++++----------- lib/depends.h | 2 +- lib/problems.c | 68 +++++++++++-------- lib/rpmds.c | 25 +++---- lib/rpmds.h | 17 +---- lib/rpminstall.c | 4 +- lib/rpmlib.h | 29 ++------ lib/ts.c | 2 +- lib/verify.c | 18 ++--- po/cs.po | 190 +++++++++++++++++++++++++++------------------------- po/da.po | 190 +++++++++++++++++++++++++++------------------------- po/de.po | 190 +++++++++++++++++++++++++++------------------------- po/en_RN.po | 182 ++++++++++++++++++++++++++------------------------ po/es.po | 182 ++++++++++++++++++++++++++------------------------ po/eu_ES.po | 182 ++++++++++++++++++++++++++------------------------ po/fi.po | 190 +++++++++++++++++++++++++++------------------------- po/fr.po | 186 ++++++++++++++++++++++++++------------------------- po/gl.po | 182 ++++++++++++++++++++++++++------------------------ po/hu.po | 182 ++++++++++++++++++++++++++------------------------ po/id.po | 182 ++++++++++++++++++++++++++------------------------ po/is.po | 184 ++++++++++++++++++++++++++------------------------ po/it.po | 182 ++++++++++++++++++++++++++------------------------ po/ja.po | 190 +++++++++++++++++++++++++++------------------------- po/ko.po | 190 +++++++++++++++++++++++++++------------------------- po/no.po | 192 ++++++++++++++++++++++++++++------------------------- po/pl.po | 190 +++++++++++++++++++++++++++------------------------- po/pt.po | 190 +++++++++++++++++++++++++++------------------------- po/pt_BR.po | 186 ++++++++++++++++++++++++++------------------------- po/ro.po | 182 ++++++++++++++++++++++++++------------------------ po/rpm.pot | 88 +++++++++++++----------- po/ru.po | 190 +++++++++++++++++++++++++++------------------------- po/sk.po | 190 +++++++++++++++++++++++++++------------------------- po/sl.po | 192 ++++++++++++++++++++++++++++------------------------- po/sr.po | 190 +++++++++++++++++++++++++++------------------------- po/sv.po | 190 +++++++++++++++++++++++++++------------------------- po/tr.po | 190 +++++++++++++++++++++++++++------------------------- po/uk.po | 182 ++++++++++++++++++++++++++------------------------ po/wa.po | 182 ++++++++++++++++++++++++++------------------------ po/zh.po | 182 ++++++++++++++++++++++++++------------------------ po/zh_CN.GB2312.po | 182 ++++++++++++++++++++++++++------------------------ python/rpmmodule.c | 8 +-- rpm.spec | 9 +++ rpm.spec.in | 1 + 45 files changed, 3096 insertions(+), 2842 deletions(-) diff --git a/CHANGES b/CHANGES index ee679e4a7..ebd1b821b 100644 --- a/CHANGES +++ b/CHANGES @@ -47,6 +47,7 @@ - rpmal: availablePackage is totally opaque, alKey with index replaces. - linear search on added package provides is dumb. - discarding entire signature header when using --addsign is dumb. + - rip out rpmDependencyConflict, replace with rpmProblem instead. 4.0.3 -> 4.0.4: diff --git a/build.c b/build.c index 792fdc7bc..908c2a9e3 100644 --- a/build.c +++ b/build.c @@ -20,7 +20,7 @@ static int checkSpec(rpmTransactionSet ts, Header h) /*@globals fileSystem, internalState @*/ /*@modifies ts, h, fileSystem, internalState @*/ { - rpmDependencyConflict conflicts; + rpmProblem conflicts; int numConflicts; int rc; diff --git a/lib/depends.c b/lib/depends.c index ed84dc7c0..728873e69 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -29,8 +29,7 @@ /*@access rpmTransactionSet@*/ /*@access alKey @*/ -/*@access rpmDependencyConflict@*/ -/*@access problemsSet@*/ +/*@access rpmProblemSet@*/ /** */ @@ -766,17 +765,17 @@ exit: /** * Check header requires/conflicts against against installed+added packages. * @param ts transaction set - * @param psp dependency problems * @param h header to check * @param keyName dependency name * @param multiLib skip multilib colored dependencies? * @return 0 no problems found */ -static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp, +static int checkPackageDeps(rpmTransactionSet ts, Header h, const char * keyName, uint_32 multiLib) /*@globals fileSystem @*/ - /*@modifies ts, h, psp, fileSystem */ + /*@modifies ts, h, fileSystem */ { + rpmProblemSet ps = ts->probs; const char * name, * version, * release; int scareMem = _DS_SCAREMEM; rpmDepSet requires; @@ -821,7 +820,7 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp, } /*@=branchstate@*/ - dsProblem(psp, h, requires, suggestedKeys); + dsProblem(ps, h, requires, suggestedKeys); } /*@switchbreak@*/ break; @@ -857,7 +856,7 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp, switch (rc) { case 0: /* conflicts exist. */ /*@-mayaliasunique@*/ /* LCL: NULL may alias h ??? */ - dsProblem(psp, h, conflicts, NULL); + dsProblem(ps, h, conflicts, NULL); /*@=mayaliasunique@*/ /*@switchbreak@*/ break; case 1: /* conflicts don't exist. */ @@ -878,15 +877,14 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp, * Adding: check name/provides key against each conflict match, * Erasing: check name/provides/filename key against each requiredby match. * @param ts transaction set - * @param psp dependency problems * @param key dependency name * @param mi rpm database iterator * @return 0 no problems found */ -static int checkPackageSet(rpmTransactionSet ts, problemsSet psp, +static int checkPackageSet(rpmTransactionSet ts, const char * key, /*@only@*/ /*@null@*/ rpmdbMatchIterator mi) /*@globals fileSystem @*/ - /*@modifies ts, mi, psp, fileSystem @*/ + /*@modifies ts, mi, fileSystem @*/ { Header h; int rc = 0; @@ -894,7 +892,7 @@ static int checkPackageSet(rpmTransactionSet ts, problemsSet psp, (void) rpmdbPruneIterator(mi, ts->removedPackages, ts->numRemovedPackages, 1); while ((h = rpmdbNextIterator(mi)) != NULL) { - if (checkPackageDeps(ts, psp, h, key, 0)) { + if (checkPackageDeps(ts, h, key, 0)) { rc = 1; break; } @@ -907,38 +905,34 @@ static int checkPackageSet(rpmTransactionSet ts, problemsSet psp, /** * Erasing: check name/provides/filename key against requiredby matches. * @param ts transaction set - * @param psp dependency problems * @param key requires name * @return 0 no problems found */ -static int checkDependentPackages(rpmTransactionSet ts, - problemsSet psp, const char * key) +static int checkDependentPackages(rpmTransactionSet ts, const char * key) /*@globals fileSystem @*/ - /*@modifies ts, psp, fileSystem @*/ + /*@modifies ts, fileSystem @*/ { rpmdbMatchIterator mi; mi = rpmtsInitIterator(ts, RPMTAG_REQUIRENAME, key, 0); - return checkPackageSet(ts, psp, key, mi); + return checkPackageSet(ts, key, mi); } /** * Adding: check name/provides key against conflicts matches. * @param ts transaction set - * @param psp dependency problems * @param key conflicts name * @return 0 no problems found */ -static int checkDependentConflicts(rpmTransactionSet ts, - problemsSet psp, const char * key) +static int checkDependentConflicts(rpmTransactionSet ts, const char * key) /*@globals fileSystem @*/ - /*@modifies ts, psp, fileSystem @*/ + /*@modifies ts, fileSystem @*/ { int rc = 0; if (ts->rpmdb) { /* XXX is this necessary? */ rpmdbMatchIterator mi; mi = rpmtsInitIterator(ts, RPMTAG_CONFLICTNAME, key, 0); - rc = checkPackageSet(ts, psp, key, mi); + rc = checkPackageSet(ts, key, mi); } return rc; @@ -1714,14 +1708,13 @@ static int rpmdbCloseDBI(/*@null@*/ rpmdb db, int rpmtag) } int rpmdepCheck(rpmTransactionSet ts, - rpmDependencyConflict * conflicts, int * numConflicts) + rpmProblem * conflicts, int * numConflicts) { int scareMem = _DS_SCAREMEM; HGE_t hge = (HGE_t)headerGetEntryMinMemory; HFD_t hfd = headerFreeData; rpmdbMatchIterator mi = NULL; Header h = NULL; - problemsSet ps = NULL; teIterator pi = NULL; transactionElement p; int closeatexit = 0; int j, xx; @@ -1734,10 +1727,7 @@ int rpmdepCheck(rpmTransactionSet ts, closeatexit = 1; } - ps = xcalloc(1, sizeof(*ps)); - ps->alloced = 5; - ps->num = 0; - ps->problems = xcalloc(ps->alloced, sizeof(*ps->problems)); + ts->probs = rpmProblemSetCreate(); *conflicts = NULL; *numConflicts = 0; @@ -1775,7 +1765,7 @@ int rpmdepCheck(rpmTransactionSet ts, multiLib = p->multiLib; rpmMessage(RPMMESS_DEBUG, "========== +++ %s\n" , pkgNVR); - rc = checkPackageDeps(ts, ps, h, NULL, multiLib); + rc = checkPackageDeps(ts, h, NULL, multiLib); h = headerFree(h, "alGetHeader"); if (rc) { @@ -1791,7 +1781,7 @@ int rpmdepCheck(rpmTransactionSet ts, *v++ = '\0'; n = pkgNVR; - rc = checkDependentConflicts(ts, ps, n); + rc = checkDependentConflicts(ts, n); pkgNVR = _free(pkgNVR); if (rc) goto exit; @@ -1809,7 +1799,7 @@ int rpmdepCheck(rpmTransactionSet ts, /*@innercontinue@*/ continue; /* XXX can't happen */ /* Adding: check provides key against conflicts matches. */ - if (!checkDependentConflicts(ts, ps, Name)) + if (!checkDependentConflicts(ts, Name)) /*@innercontinue@*/ continue; rc = 1; /*@innerbreak@*/ break; @@ -1838,7 +1828,7 @@ int rpmdepCheck(rpmTransactionSet ts, name, version, release); /* Erasing: check name against requiredby matches. */ - rc = checkDependentPackages(ts, ps, name); + rc = checkDependentPackages(ts, name); if (rc) goto exit; } @@ -1853,7 +1843,7 @@ int rpmdepCheck(rpmTransactionSet ts, /*@innercontinue@*/ continue; /* XXX can't happen */ /* Erasing: check provides against requiredby matches. */ - if (!checkDependentPackages(ts, ps, Name)) + if (!checkDependentPackages(ts, Name)) /*@innercontinue@*/ continue; rc = 1; /*@innerbreak@*/ break; @@ -1886,7 +1876,7 @@ int rpmdepCheck(rpmTransactionSet ts, *fileName = '\0'; (void) stpcpy( stpcpy(fileName, dirNames[dirIndexes[j]]) , baseNames[j]); /* Erasing: check filename against requiredby matches. */ - if (!checkDependentPackages(ts, ps, fileName)) + if (!checkDependentPackages(ts, fileName)) /*@innercontinue@*/ continue; rc = 1; /*@innerbreak@*/ break; @@ -1905,25 +1895,23 @@ int rpmdepCheck(rpmTransactionSet ts, } /*@=branchstate@*/ - if (ps->num) { - *conflicts = ps->problems; - ps->problems = NULL; - *numConflicts = ps->num; + if (ts->probs->numProblems) { + *conflicts = ts->probs->probs; + ts->probs->probs = NULL; + *numConflicts = ts->probs->numProblems; } rc = 0; exit: mi = rpmdbFreeIterator(mi); pi = teFreeIterator(pi); - if (ps) { - ps->problems = _free(ps->problems); - ps = _free(ps); - } /*@-branchstate@*/ if (closeatexit) xx = rpmtsCloseDB(ts); else if (_cacheDependsRC) xx = rpmdbCloseDBI(ts->rpmdb, RPMDBI_DEPENDS); /*@=branchstate@*/ + rpmProblemSetFree(ts->probs); + ts->probs = NULL; return rc; } diff --git a/lib/depends.h b/lib/depends.h index d34552867..0eb2ffeaf 100644 --- a/lib/depends.h +++ b/lib/depends.h @@ -118,7 +118,7 @@ struct rpmTransactionSet_s { rpmCallbackFunction notify; /*!< Callback function. */ /*@observer@*/ /*@null@*/ rpmCallbackData notifyData; /*!< Callback private data. */ -/*@dependent@*/ +/*@owned@*/ rpmProblemSet probs; /*!< Current problems in transaction. */ rpmprobFilterFlags ignoreSet; /*!< Bits to filter current problems. */ diff --git a/lib/problems.c b/lib/problems.c index a0a799750..e75e08235 100644 --- a/lib/problems.c +++ b/lib/problems.c @@ -13,7 +13,6 @@ /*@access fnpyKey@*/ /*@access rpmProblem@*/ /*@access rpmProblemSet@*/ -/*@access rpmDependencyConflict@*/ rpmProblemSet rpmProblemSetCreate(void) { @@ -144,61 +143,63 @@ void printDepFlags(FILE * fp, const char * version, int flags) fprintf(fp, " %s", version); } -static int sameProblem(const rpmDependencyConflict ap, - const rpmDependencyConflict bp) +static int sameProblem(const rpmProblem ap, const rpmProblem bp) /*@*/ { - if (ap->byNEVR && bp->byNEVR && strcmp(ap->byNEVR, bp->byNEVR)) - return 1; - if (ap->needsNEVR && bp->needsNEVR && strcmp(ap->needsNEVR, bp->needsNEVR)) - return 1; + if (ap->pkgNEVR) + if (bp->pkgNEVR && strcmp(ap->pkgNEVR, bp->pkgNEVR)) + return 1; + if (ap->altNEVR) + if (bp->altNEVR && strcmp(ap->altNEVR, bp->altNEVR)) + return 1; return 0; } /* XXX FIXME: merge into problems */ -rpmDependencyConflict rpmdepFreeConflicts(rpmDependencyConflict conflicts, +rpmProblem rpmdepFreeConflicts(rpmProblem conflicts, int numConflicts) { - rpmDependencyConflict c; int i; - if (conflicts) + if (conflicts != NULL) for (i = 0; i < numConflicts; i++) { - c = conflicts + i; - c->byNEVR = _free(c->byNEVR); - c->needsNEVR = _free(c->needsNEVR); - /*@-evalorder@*/ - c->suggestedKeys = _free(c->suggestedKeys); - /*@=evalorder@*/ + rpmProblem p = conflicts + i; + p->pkgNEVR = _free(p->pkgNEVR); + p->altNEVR = _free(p->altNEVR); + p->str1 = _free(p->str1); } - - return (conflicts = _free(conflicts)); + conflicts = _free(conflicts); + return NULL; } /* XXX FIXME: merge into problems */ -void printDepProblems(FILE * fp, - const rpmDependencyConflict conflicts, int numConflicts) +void printDepProblems(FILE * fp, rpmProblem conflicts, int numConflicts) { - rpmDependencyConflict c; + const char * pkgNEVR, * altNEVR; + rpmProblem c; int i; for (i = 0; i < numConflicts; i++) { int j; + c = conflicts + i; + /* Filter already displayed problems. */ for (j = 0; j < i; j++) { - if (!sameProblem(conflicts + i, conflicts + j)) + if (!sameProblem(c, conflicts + j)) /*@innerbreak@*/ break; } if (j < i) continue; - c = conflicts + i; - fprintf(fp, "\t%s %s %s\n", c->needsNEVR+2, - ((c->needsNEVR[0] == 'C' && c->needsNEVR[1] == ' ') + pkgNEVR = (c->pkgNEVR ? c->pkgNEVR : "?pkgNEVR?"); + altNEVR = (c->altNEVR ? c->altNEVR : "? ?altNEVR?"); + + fprintf(fp, "\t%s %s %s\n", altNEVR+2, + ((altNEVR[0] == 'C' && altNEVR[1] == ' ') ? _("conflicts with") : _("is needed by")), - c->byNEVR); + pkgNEVR); } } @@ -227,9 +228,12 @@ static inline int snprintf(/*@out@*/ char * buf, int nb, const char * fmt, ...) const char * rpmProblemString(const rpmProblem prob) { -/*@observer@*/ const char * pkgNEVR = (prob->pkgNEVR ? prob->pkgNEVR : ""); -/*@observer@*/ const char * altNEVR = (prob->altNEVR ? prob->altNEVR : ""); -/*@observer@*/ const char * str1 = (prob->str1 ? prob->str1 : ""); +/*@observer@*/ + const char * pkgNEVR = (prob->pkgNEVR ? prob->pkgNEVR : "?pkgNEVR?"); +/*@observer@*/ + const char * altNEVR = (prob->altNEVR ? prob->altNEVR : "?altNEVR?"); +/*@observer@*/ + const char * str1 = (prob->str1 ? prob->str1 : ""); int nb = strlen(pkgNEVR) + strlen(str1) + strlen(altNEVR) + 100; char * buf = xmalloc(nb+1); int rc; @@ -291,7 +295,13 @@ const char * rpmProblemString(const rpmProblem prob) pkgNEVR, str1, strerror(prob->ulong1)); break; case RPMPROB_REQUIRES: + rc = snprintf(buf, nb, _("package %s has unsatisfied Requires: %s\n"), + pkgNEVR, altNEVR+2); + break; case RPMPROB_CONFLICT: + rc = snprintf(buf, nb, _("package %s has unsatisfied Conflicts: %s\n"), + pkgNEVR, altNEVR+2); + break; default: rc = snprintf(buf, nb, _("unknown error %d encountered while manipulating package %s"), diff --git a/lib/rpmds.c b/lib/rpmds.c index a2d940708..981d096ad 100644 --- a/lib/rpmds.c +++ b/lib/rpmds.c @@ -8,9 +8,6 @@ #include "debug.h" -/*@access rpmDependencyConflict @*/ -/*@access problemsSet @*/ - /*@access alKey@*/ /*@access rpmFNSet @*/ @@ -536,14 +533,15 @@ exit: return result; } -void dsProblem(problemsSet psp, Header h, const rpmDepSet ds, +void dsProblem(rpmProblemSet tsprobs, Header h, const rpmDepSet ds, const fnpyKey * suggestedKeys) { - rpmDependencyConflict dcp; const char * Name = dsiGetN(ds); const char * DNEVR = dsiGetDNEVR(ds); const char * EVR = dsiGetEVR(ds); char * byNEVR = hGetNVR(h, NULL); + rpmProblemType type; + fnpyKey key; /*@-branchstate@*/ if (Name == NULL) Name = "?N?"; @@ -554,18 +552,11 @@ void dsProblem(problemsSet psp, Header h, const rpmDepSet ds, rpmMessage(RPMMESS_DEBUG, _("package %s has unsatisfied %s: %s\n"), byNEVR, ds->Type, DNEVR+2); - if (psp->num == psp->alloced) { - psp->alloced += 5; - psp->problems = xrealloc(psp->problems, - sizeof(*psp->problems) * psp->alloced); - } - - dcp = psp->problems + psp->num; - psp->num++; - - dcp->byNEVR = byNEVR; - dcp->needsNEVR = xstrdup(DNEVR); - dcp->suggestedKeys = suggestedKeys; + type = (DNEVR[0] == 'C' && DNEVR[1] == ' ') + ? RPMPROB_CONFLICT : RPMPROB_REQUIRES; + key = (suggestedKeys ? suggestedKeys[0] : NULL); + rpmProblemSetAppend(tsprobs, type, byNEVR, key, + NULL, NULL, xstrdup(DNEVR), 0); } int rangeMatchesDepFlags (Header h, const rpmDepSet req) diff --git a/lib/rpmds.h b/lib/rpmds.h index 5441a9a29..904456ea2 100644 --- a/lib/rpmds.h +++ b/lib/rpmds.h @@ -6,19 +6,6 @@ * Structure used for handling a dependency set. */ -/** - */ -typedef /*@abstract@*/ struct problemsSet_s * problemsSet; - -/** - * Problems encountered while checking dependencies. - */ -struct problemsSet_s { - rpmDependencyConflict problems; /*!< Problems encountered. */ - int num; /*!< No. of problems found. */ - int alloced; /*!< No. of problems allocated. */ -} ; - /** */ typedef /*@abstract@*/ struct rpmFNSet_s * rpmFNSet; @@ -227,9 +214,9 @@ int dsCompare(const rpmDepSet A, const rpmDepSet B) /** * Report a Requires: or Conflicts: dependency problem. */ -void dsProblem(problemsSet psp, Header h, const rpmDepSet ds, +void dsProblem(rpmProblemSet tsprobs, Header h, const rpmDepSet ds, /*@only@*/ /*@null@*/ const fnpyKey * suggestedKeys) - /*@modifies psp, h @*/; + /*@modifies tsprobs, h @*/; /** * Compare package provides dependencies from header with a single dependency. diff --git a/lib/rpminstall.c b/lib/rpminstall.c index c0043a2f6..295a076ab 100644 --- a/lib/rpminstall.c +++ b/lib/rpminstall.c @@ -501,7 +501,7 @@ restart: if (eiu->numFailed) goto exit; if (eiu->numRPMS && !(interfaceFlags & INSTALL_NODEPS)) { - rpmDependencyConflict conflicts; + rpmProblem conflicts; int numConflicts; /*@-nullstate@*/ /* FIX: ts->rootDir may be NULL? */ @@ -604,7 +604,7 @@ int rpmErase(rpmTransactionSet ts, const char ** argv, int count; const char ** arg; int numFailed = 0; - rpmDependencyConflict conflicts; + rpmProblem conflicts; int numConflicts; int stopUninstall = 0; int numPackages = 0; diff --git a/lib/rpmlib.h b/lib/rpmlib.h index 8c8a7ddee..44b2f6f4a 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -949,11 +949,6 @@ typedef /*@abstract@*/ struct rpmProblem_s * rpmProblem; */ typedef /*@abstract@*/ struct rpmProblemSet_s * rpmProblemSet; -/** - * Dependency problems found by rpmdepCheck(). - */ -typedef /*@abstract@*/ struct rpmDependencyConflict_s * rpmDependencyConflict; - /** * Enumerate transaction set problem types. */ @@ -962,8 +957,8 @@ typedef enum rpmProblemType_e { RPMPROB_BADOS, /*!< package ... is for a different operating system */ RPMPROB_PKG_INSTALLED, /*!< package ... is already installed */ RPMPROB_BADRELOCATE,/*!< path ... is not relocateable for package ... */ - RPMPROB_REQUIRES, /*!< @todo Use for dependency errors. */ - RPMPROB_CONFLICT, /*!< @todo Use for dependency errors. */ + RPMPROB_REQUIRES, /*!< package ... has unsatisfied Requires: ... */ + RPMPROB_CONFLICT, /*!< package ... has unsatisfied Conflicts: ... */ RPMPROB_NEW_FILE_CONFLICT, /*!< file ... conflicts between attemped installs of ... */ RPMPROB_FILE_CONFLICT,/*!< file ... from install of ... conflicts with file from package ... */ RPMPROB_OLDPACKAGE, /*!< package ... (which is newer than ...) is already installed */ @@ -977,7 +972,7 @@ typedef enum rpmProblemType_e { struct rpmProblem_s { /*@only@*/ /*@null@*/ const char * pkgNEVR; /*@only@*/ /*@null@*/ const char * altNEVR; -/*@kept@*/ /*@null@*/ fnpyKey key; +/*@dependent@*/ /*@null@*/ fnpyKey key; rpmProblemType type; int ignoreProblem; /*@only@*/ /*@null@*/ const char * str1; @@ -998,23 +993,13 @@ void printDepFlags(FILE *fp, const char *version, int flags) /*@globals fileSystem @*/ /*@modifies *fp, fileSystem @*/; -/** - */ -struct rpmDependencyConflict_s { - char * byNEVR; /*!< package name-version-release */ - char * needsNEVR; /*!< dependency [R|C] name ?? epoch:version-release */ -/*@owned@*/ /*@null@*/ - const fnpyKey * suggestedKeys; /*!< Added package keys, NULL terminated. */ -}; - /** * Print results of rpmdepCheck() dependency check. * @param fp output file * @param conflicts dependency problems * @param numConflicts no. of dependency problems */ -void printDepProblems(FILE * fp, const rpmDependencyConflict conflicts, - int numConflicts) +void printDepProblems(FILE * fp, rpmProblem conflicts, int numConflicts) /*@globals fileSystem @*/ /*@modifies *fp, fileSystem @*/; @@ -1474,7 +1459,7 @@ int rpmtransGetKeys(const rpmTransactionSet ts, * @return 0 on success */ int rpmdepCheck(rpmTransactionSet ts, - /*@exposed@*/ /*@out@*/ rpmDependencyConflict * conflicts, + /*@exposed@*/ /*@out@*/ rpmProblem * conflicts, /*@exposed@*/ /*@out@*/ int * numConflicts) /*@globals fileSystem, internalState @*/ /*@modifies ts, *conflicts, *numConflicts, @@ -1509,8 +1494,8 @@ int rpmdepOrder(rpmTransactionSet ts) * @param numConflicts no. of dependency problems * @retrun NULL always */ -/*@null@*/ rpmDependencyConflict rpmdepFreeConflicts( - /*@only@*/ /*@null@*/ rpmDependencyConflict conflicts, +/*@null@*/ rpmProblem rpmdepFreeConflicts( + /*@only@*/ /*@null@*/ rpmProblem conflicts, int numConflicts) /*@modifies conflicts @*/; diff --git a/lib/ts.c b/lib/ts.c index 5ec561a22..2fd5cbb8c 100644 --- a/lib/ts.c +++ b/lib/ts.c @@ -370,7 +370,7 @@ if (!_debug) { #ifdef NOTYET if (!_debug) { - { rpmDependencyConflict conflicts = NULL; + { rpmProblem conflicts = NULL; int numConflicts = 0; (void) rpmdepCheck(ts, &conflicts, &numConflicts); diff --git a/lib/verify.c b/lib/verify.c index a0522a513..57fd10f19 100644 --- a/lib/verify.c +++ b/lib/verify.c @@ -13,7 +13,7 @@ #include "misc.h" /* XXX for uidToUname() and gnameToGid() */ #include "debug.h" -/*@access rpmDependencyConflict @*/ +/*@access rpmProblem @*/ /*@access rpmTransactionSet @*/ /*@access TFI_t @*/ /*@access PSM_t @*/ @@ -490,7 +490,7 @@ static int verifyDependencies(/*@unused@*/ QVA_t qva, rpmTransactionSet ts, /*@globals fileSystem, internalState @*/ /*@modifies ts, h, fileSystem, internalState @*/ { - rpmDependencyConflict conflicts; + rpmProblem conflicts; int numConflicts; int rc = 0; /* assume no problems */ int i; @@ -502,27 +502,29 @@ static int verifyDependencies(/*@unused@*/ QVA_t qva, rpmTransactionSet ts, /*@-branchstate@*/ if (numConflicts) { - rpmDependencyConflict c; + const char * pkgNEVR, * altNEVR; + rpmProblem c; char * t, * te; int nb = 512; - /*@-type@*/ /* FIX: rpmDependencyConflict usage */ for (i = 0; i < numConflicts; i++) { c = conflicts + i; - nb += strlen(c->needsNEVR+2) + sizeof(", ") - 1; + altNEVR = (c->altNEVR ? c->altNEVR : "? ?altNEVR?"); + nb += strlen(altNEVR+2) + sizeof(", ") - 1; } te = t = alloca(nb); *te = '\0'; - sprintf(te, _("Unsatisifed dependencies for %s:"), conflicts[0].byNEVR); + pkgNEVR = (conflicts->pkgNEVR ? conflicts->pkgNEVR : "?pkgNEVR?"); + sprintf(te, _("Unsatisifed dependencies for %s:"), pkgNEVR); te += strlen(te); for (i = 0; i < numConflicts; i++) { c = conflicts + i; + altNEVR = (c->altNEVR ? c->altNEVR : "? ?altNEVR?"); if (i) te = stpcpy(te, ", "); /* XXX FIXME: should probably supply the "[R|C] " type prefix */ - te = stpcpy(te, c->needsNEVR+2); + te = stpcpy(te, altNEVR+2); } conflicts = rpmdepFreeConflicts(conflicts, numConflicts); - /*@=type@*/ if (te > t) { *te++ = '\n'; diff --git a/po/cs.po b/po/cs.po index 20b6d98b1..6ac31e0b5 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "Zapsáno: %s\n" @@ -1432,99 +1432,99 @@ msgstr "" msgid " failed - " msgstr "selhal - " -#: lib/depends.c:115 +#: lib/depends.c:114 #, c-format msgid "cannot open Packages database in %s\n" msgstr "nemohu otevøít databázi balíèkù v %s\n" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "balíèek %s je ji¾ nainstalován" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s ANO (rpmrc poskytuje)\n" -#: lib/depends.c:675 +#: lib/depends.c:671 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s ANO (rpmlib poskytuje)\n" -#: lib/depends.c:696 +#: lib/depends.c:692 #, fuzzy msgid "(db files)" msgstr "¹patnı db soubor %s\n" -#: lib/depends.c:708 +#: lib/depends.c:704 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s ANO (db poskytuje)\n" -#: lib/depends.c:721 +#: lib/depends.c:717 #, fuzzy msgid "(db package)" msgstr "¾ádné balíèky\n" -#: lib/depends.c:760 +#: lib/depends.c:756 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) pøidáno do ke¹e závislostí.\n" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "NE " -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "ANO" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "========== ukládání tsort relací\n" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 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:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "SMYÈKA:\n" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "========== pokraèuje tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2150,67 +2150,77 @@ msgstr "podepsat bal msgid "generate signature" msgstr "generovat PGP/GPG podpis" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" -msgstr " je nutné pro %s-%s-%s\n" - -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +#, fuzzy +msgid "conflicts with" msgstr " koliduje s %s-%s-%s\n" -#: lib/problems.c:268 +#: lib/problems.c:201 +#, fuzzy +msgid "is needed by" +msgstr " je nutné pro %s-%s-%s\n" + +#: lib/problems.c:244 #, c-format msgid "package %s is for a different architecture" msgstr "balíèek %s je pro jinou architekturu" -#: lib/problems.c:273 +#: lib/problems.c:249 #, 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:278 +#: lib/problems.c:254 #, c-format msgid "package %s is already installed" msgstr "balíèek %s je ji¾ nainstalován" -#: lib/problems.c:283 +#: lib/problems.c:259 #, 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:288 +#: lib/problems.c:264 #, 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:293 +#: lib/problems.c:269 #, 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:298 +#: lib/problems.c:274 #, 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:303 +#: lib/problems.c:279 #, 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:313 +#: lib/problems.c:289 #, 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:318 +#: lib/problems.c:294 #, 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:325 +#: lib/problems.c:298 +#, fuzzy, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n" + +#: lib/problems.c:302 +#, fuzzy, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "neznámá chyba %d vznikla pøi manipulaci s balíèkem %s" @@ -2263,60 +2273,60 @@ msgstr "nemohu zapsat do %%%s %s\n" msgid "source package expected, binary found\n" msgstr "oèekávám balíèek se zdrojovımi kódy, nalezen v¹ak binární\n" -#: lib/psm.c:1330 +#: lib/psm.c:1322 msgid "source package contains no .spec file\n" msgstr "zdrojovı balíèek neobsahuje .spec soubor\n" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: spou¹tím %s skript(y) (pokud existují)\n" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, 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:1615 +#: lib/psm.c:1607 #, 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:1957 +#: lib/psm.c:1949 #, 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:2074 +#: lib/psm.c:2066 #, 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:2188 +#: lib/psm.c:2180 #, 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:2197 +#: lib/psm.c:2189 #, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ita skupina root\n" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalování archívu selhalo %s%s: %s\n" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr " na souboru " -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nemohu otevøít %s: %s\n" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s selhalo\n" @@ -2364,8 +2374,8 @@ msgstr "bal msgid "can't query %s: %s\n" msgstr "nemohu provést dotaz %s: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "otevøení %s selhalo: %s\n" @@ -2379,7 +2389,7 @@ msgstr "dotaz na %s se nezda msgid "old format source packages cannot be queried\n" msgstr "nelze provést dotaz na zdrojové balíèky starého formátu\n" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: Fread selhalo: %s\n" @@ -2438,17 +2448,17 @@ msgstr "z msgid "record %u could not be read\n" msgstr "záznam %d nelze pøeèíst\n" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "balíèek %s není nainstalován\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 #, fuzzy msgid "(added files)" msgstr "¹patnı db soubor %s\n" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s ANO (db poskytuje)\n" @@ -2517,7 +2527,7 @@ msgid "OK" msgstr "OK" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2526,95 +2536,95 @@ msgstr "" "Závislost \"B\" potøebuje období (pøedpokládáno stejné jako \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, fuzzy, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "Pøipravuji..." -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 msgid "Preparing packages for installation..." msgstr "Pøipravuji balíèky pro instalaci..." -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "Stahuji %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr " ... jako %s\n" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "pøeskakuji %s - pøenos selhal - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "balíèek %s není pøemístitelnı\n" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "chyba pøi ètení ze souboru %s\n" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "soubor %s vy¾aduje novìj¹í verzi RPM\n" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "%s nemù¾e bıt nainstalován\n" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "nalezeno %d zdrojovıch a %d binárních balíèkù\n" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "nevyøe¹ené závislosti:\n" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "instaluji binární balíèky\n" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, c-format msgid "cannot open file %s: %s\n" msgstr "nemohu otevøít soubor %s: %s\n" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" urèuje více balíèkù\n" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "odstranìní tìchto balíèkù by poru¹ilo závislosti:\n" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, c-format msgid "cannot open %s: %s\n" msgstr "nemohu otevøít %s: %s\n" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "Instaluji %s\n" @@ -2865,39 +2875,39 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Podpisu: velikost(%d)+vata(%d)\n" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, 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:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "vynechávám adresáø %s\n" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" "balíèek neobsahuje ani u¾ivatelská jména ani seznam id (nemìlo by se nikdy " "stát)\n" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" "balíèek neobsahuje ani jména skupin ani seznam id (nemìlo by se nikdy stát)\n" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "chybí %s" -#: lib/verify.c:517 -#, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +#: lib/verify.c:518 +#, fuzzy, c-format +msgid "Unsatisifed dependencies for %s:" msgstr "Nevyøe¹ené závislosti pro %s-%s-%s: " -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "%s-%s-%s: kontrola digestu v hlavièce selhala\n" diff --git a/po/da.po b/po/da.po index fc72688e1..3d9b6387b 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1433,99 +1433,99 @@ msgstr "" msgid " failed - " msgstr " mislykkedes - " -#: lib/depends.c:115 +#: lib/depends.c:114 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kunne ikke åbne Packages-database i %s\n" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "pakken %s er allerede installeret" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s JA (rpmrc tilfører)\n" -#: lib/depends.c:675 +#: lib/depends.c:671 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s JA (rpmlib tilfører)\n" -#: lib/depends.c:696 +#: lib/depends.c:692 #, fuzzy msgid "(db files)" msgstr "ugyldig db-fil %s\n" -#: lib/depends.c:708 +#: lib/depends.c:704 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s JA (db tilfører)\n" -#: lib/depends.c:721 +#: lib/depends.c:717 #, fuzzy msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:760 +#: lib/depends.c:756 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) tilføjet til afhængigheds-buffer.\n" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 #, fuzzy msgid "NO " msgstr "IKKE O.K." -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "fjerne %s-%s-%s \"%s\" fra tsort-relationer.\n" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "========== gemmer tsort-relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "LØKKE:\n" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "========== fortsætter tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2168,68 +2168,78 @@ msgstr "underskriv en pakke (slet nuv msgid "generate signature" msgstr "generér PGP/GPG-signatur" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" -msgstr " kræves af %s-%s-%s\n" - -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +#, fuzzy +msgid "conflicts with" msgstr " skaber konflikt med %s-%s-%s\n" -#: lib/problems.c:268 +#: lib/problems.c:201 +#, fuzzy +msgid "is needed by" +msgstr " kræves af %s-%s-%s\n" + +#: lib/problems.c:244 #, c-format msgid "package %s is for a different architecture" msgstr "pakken %s hører til en anden arkitektur" -#: lib/problems.c:273 +#: lib/problems.c:249 #, c-format msgid "package %s is for a different operating system" msgstr "pakken %s hører til et andet operativsystem" -#: lib/problems.c:278 +#: lib/problems.c:254 #, c-format msgid "package %s is already installed" msgstr "pakken %s er allerede installeret" -#: lib/problems.c:283 +#: lib/problems.c:259 #, c-format msgid "path %s in package %s is not relocateable" msgstr "sti %s i pakke %s kan ikke omrokeres" -#: lib/problems.c:288 +#: lib/problems.c:264 #, 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:293 +#: lib/problems.c:269 #, 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:298 +#: lib/problems.c:274 #, 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:303 +#: lib/problems.c:279 #, 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:313 +#: lib/problems.c:289 #, 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:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "pakke %s prætransaktion-systemkald: %s mislykkedes: %s" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, fuzzy, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" + +#: lib/problems.c:302 +#, fuzzy, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ukendt fejl %d under arbejdet med pakken %s" @@ -2282,62 +2292,62 @@ msgstr "kunne ikke skrive til %s\n" msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binær fundet\n" -#: lib/psm.c:1330 +#: lib/psm.c:1322 msgid "source package contains no .spec file\n" msgstr "kildepakke indeholder ingen .spec-fil\n" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "kører postinstallations-skript (hvis det findes)\n" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, 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:1615 +#: lib/psm.c:1607 #, 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:1957 +#: lib/psm.c:1949 #, 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:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "bruger %s eksisterer ikke - bruger root\n" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, c-format msgid "group %s does not exist - using root\n" msgstr "gruppe %s eksisterer ikke - bruger root\n" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "udpakning af arkiv mislykkedes%s%s: %s\n" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr " for fil " -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s mislykkedes\n" @@ -2385,8 +2395,8 @@ msgstr "pakke har hverken filejerskabs- eller id-lister\n" msgid "can't query %s: %s\n" msgstr "kunne ikke forespørge %s: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "åbning af %s mislykkedes %s\n" @@ -2400,7 +2410,7 @@ msgstr "foresp msgid "old format source packages cannot be queried\n" msgstr "pakke med gammelt kildeformat kan ikke forespørges\n" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: læs manifest mislykkedes: %s\n" @@ -2459,17 +2469,17 @@ msgstr "pakkens post-nummer: %u\n" msgid "record %u could not be read\n" msgstr "post %d kunne ikke læses\n" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "pakken %s er ikke installeret\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 #, fuzzy msgid "(added files)" msgstr "ugyldig db-fil %s\n" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s JA (db tilfører)\n" @@ -2538,7 +2548,7 @@ msgid "OK" msgstr "O.K." #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2547,95 +2557,95 @@ msgstr "" "\"B\"-afhængighed kræver en epoke (antager samme som \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, fuzzy, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "Forbereder..." -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 msgid "Preparing packages for installation..." msgstr "Forbereder pakker til installation..." -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "Modtager %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr " ... som %s\n" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "overspringer %s - overførsel mislykkedes - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "pakke %s kan ikke omrokeres\n" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "fejl ved læsning fra filen %s\n" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "filen %s kræver en nyere version af RPM\n" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "%s kunne ikke installeres\n" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "fandt %d kilde- og %d binærpakker\n" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "afhængighedskrav, der ikke kunne imødekommes:\n" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "installerer binærpakker\n" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, c-format msgid "cannot open file %s: %s\n" msgstr "kunne ikke åbne fil %s: %s\n" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" angiver flere pakker\n" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "fjernelse af disse pakker ville bryde afhængighederne:\n" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, c-format msgid "cannot open %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" @@ -2887,40 +2897,40 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signaturfyld : %d\n" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s oversprunget grundet manglende ok-flag\n" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer kataloget %s\n" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" "pakken har hverken en liste over brugernavne eller id (det burde ikke kunne " "ske)\n" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" "pakken har hverken en liste over gruppenavne eller id (det burde ikke kunne " "ske)\n" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "manglende %s" -#: lib/verify.c:517 -#, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +#: lib/verify.c:518 +#, fuzzy, c-format +msgid "Unsatisifed dependencies for %s:" msgstr "Ikke-tilfredsstillede afhængighedskrav for %s-%s-%s: " -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/de.po b/po/de.po index 2e035e173..35d372dea 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1568,100 +1568,100 @@ msgstr "" msgid " failed - " msgstr "pgp fehlgeschlagen" -#: lib/depends.c:115 +#: lib/depends.c:114 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "Paket %s ist nicht installiert\n" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 #, fuzzy msgid "(rpmrc provides)" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:675 +#: lib/depends.c:671 #, fuzzy msgid "(rpmlib provides)" msgstr "die Datei »%s« gehört zu keinem Paket\n" # , c-format -#: lib/depends.c:696 +#: lib/depends.c:692 #, fuzzy msgid "(db files)" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/depends.c:708 +#: lib/depends.c:704 #, fuzzy msgid "(db provides)" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:721 +#: lib/depends.c:717 #, fuzzy msgid "(db package)" msgstr "Anfrage an alle Pakete" -#: lib/depends.c:760 +#: lib/depends.c:756 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" # FIXME -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2337,71 +2337,81 @@ msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)" msgid "generate signature" msgstr "PGP-Signatur generieren" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" -msgstr " wird von %s-%s-%s gebraucht\n" - -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +#, fuzzy +msgid "conflicts with" msgstr " steht im Konflikt mit %s-%s-%s\n" +#: lib/problems.c:201 +#, fuzzy +msgid "is needed by" +msgstr " wird von %s-%s-%s gebraucht\n" + # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/problems.c:268 +#: lib/problems.c:244 #, 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:273 +#: lib/problems.c:249 #, fuzzy, c-format msgid "package %s is for a different operating system" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/problems.c:278 +#: lib/problems.c:254 #, fuzzy, c-format msgid "package %s is already installed" msgstr "Paket %s ist nicht installiert\n" -#: lib/problems.c:283 +#: lib/problems.c:259 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "Paket %s ist nicht installiert\n" -#: lib/problems.c:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:269 #, 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:298 +#: lib/problems.c:274 #, 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:303 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/problems.c:318 +#: lib/problems.c:294 #, 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:325 +#: lib/problems.c:298 +#, fuzzy, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "Paket %s wird nicht in %s aufgeführt" + +#: lib/problems.c:302 +#, fuzzy, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "Paket %s wird nicht in %s aufgeführt" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" @@ -2457,63 +2467,63 @@ msgstr "kann Datei %s nicht msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1322 #, fuzzy msgid "source package contains no .spec file\n" msgstr "Anfrage nach Paket, das die Datei besitzt" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "Keine Stufen ausführen" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, 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:1615 +#: lib/psm.c:1607 #, 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:1957 +#: lib/psm.c:1949 #, 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:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp fehlgeschlagen" @@ -2563,8 +2573,8 @@ msgstr "Paket hat keinen Namen" msgid "can't query %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" @@ -2578,7 +2588,7 @@ msgstr "Anfrage von %s fehlgeschlagen\n" msgid "old format source packages cannot be queried\n" msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: »readLead« fehlgeschlagen\n" @@ -2640,18 +2650,18 @@ msgstr "ung msgid "record %u could not be read\n" msgstr "Eintrag %d konnte nicht gelesen werden\n" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "Paket %s ist nicht installiert\n" # , c-format -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 #, fuzzy msgid "(added files)" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 #, fuzzy msgid "(added provide)" msgstr "die Datei »%s« gehört zu keinem Paket\n" @@ -2722,106 +2732,106 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, fuzzy, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 #, fuzzy msgid "Preparing packages for installation..." msgstr "Es wurden keine Pakete für die Installation angegeben" # , c-format -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "Hole %s heraus\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "Paket %s ist nicht installiert\n" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "Fehler: %s kann nicht installiert werden\n" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 #, fuzzy msgid "installing binary packages\n" msgstr "Paket installieren" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" bezeichnet mehrere Pakete\n" # oder besser: "... verletzen" ? -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "Installiere %s\n" @@ -3085,36 +3095,36 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:420 +#: lib/verify.c:421 #, fuzzy, c-format msgid "missing %s" msgstr "fehlende { nach %{" -#: lib/verify.c:517 -#, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +#: lib/verify.c:518 +#, fuzzy, c-format +msgid "Unsatisifed dependencies for %s:" msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: " -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/en_RN.po b/po/en_RN.po index 65727bd5b..eef15a11f 100644 --- a/po/en_RN.po +++ b/po/en_RN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,93 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:115 +#: lib/depends.c:114 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:675 +#: lib/depends.c:671 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:696 +#: lib/depends.c:692 msgid "(db files)" msgstr "" -#: lib/depends.c:708 +#: lib/depends.c:704 msgid "(db provides)" msgstr "" -#: lib/depends.c:721 +#: lib/depends.c:717 msgid "(db package)" msgstr "" -#: lib/depends.c:760 +#: lib/depends.c:756 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2105,67 +2105,75 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" +#: lib/problems.c:201 +msgid "conflicts with" msgstr "" -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +msgid "is needed by" msgstr "" -#: lib/problems.c:268 +#: lib/problems.c:244 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:273 +#: lib/problems.c:249 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:278 +#: lib/problems.c:254 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:283 +#: lib/problems.c:259 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:269 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:274 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "" + +#: lib/problems.c:302 +#, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" @@ -2218,60 +2226,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1322 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1615 +#: lib/psm.c:1607 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1957 +#: lib/psm.c:1949 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr "" -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2319,8 +2327,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2334,7 +2342,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2393,16 +2401,16 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 msgid "(added files)" msgstr "" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 msgid "(added provide)" msgstr "" @@ -2470,102 +2478,102 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "" @@ -2812,36 +2820,36 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:517 +#: lib/verify.c:518 #, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +msgid "Unsatisifed dependencies for %s:" msgstr "" -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/es.po b/po/es.po index 65727bd5b..eef15a11f 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,93 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:115 +#: lib/depends.c:114 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:675 +#: lib/depends.c:671 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:696 +#: lib/depends.c:692 msgid "(db files)" msgstr "" -#: lib/depends.c:708 +#: lib/depends.c:704 msgid "(db provides)" msgstr "" -#: lib/depends.c:721 +#: lib/depends.c:717 msgid "(db package)" msgstr "" -#: lib/depends.c:760 +#: lib/depends.c:756 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2105,67 +2105,75 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" +#: lib/problems.c:201 +msgid "conflicts with" msgstr "" -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +msgid "is needed by" msgstr "" -#: lib/problems.c:268 +#: lib/problems.c:244 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:273 +#: lib/problems.c:249 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:278 +#: lib/problems.c:254 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:283 +#: lib/problems.c:259 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:269 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:274 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "" + +#: lib/problems.c:302 +#, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" @@ -2218,60 +2226,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1322 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1615 +#: lib/psm.c:1607 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1957 +#: lib/psm.c:1949 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr "" -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2319,8 +2327,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2334,7 +2342,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2393,16 +2401,16 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 msgid "(added files)" msgstr "" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 msgid "(added provide)" msgstr "" @@ -2470,102 +2478,102 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "" @@ -2812,36 +2820,36 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:517 +#: lib/verify.c:518 #, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +msgid "Unsatisifed dependencies for %s:" msgstr "" -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/eu_ES.po b/po/eu_ES.po index 65727bd5b..eef15a11f 100644 --- a/po/eu_ES.po +++ b/po/eu_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,93 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:115 +#: lib/depends.c:114 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:675 +#: lib/depends.c:671 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:696 +#: lib/depends.c:692 msgid "(db files)" msgstr "" -#: lib/depends.c:708 +#: lib/depends.c:704 msgid "(db provides)" msgstr "" -#: lib/depends.c:721 +#: lib/depends.c:717 msgid "(db package)" msgstr "" -#: lib/depends.c:760 +#: lib/depends.c:756 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2105,67 +2105,75 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" +#: lib/problems.c:201 +msgid "conflicts with" msgstr "" -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +msgid "is needed by" msgstr "" -#: lib/problems.c:268 +#: lib/problems.c:244 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:273 +#: lib/problems.c:249 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:278 +#: lib/problems.c:254 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:283 +#: lib/problems.c:259 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:269 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:274 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "" + +#: lib/problems.c:302 +#, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" @@ -2218,60 +2226,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1322 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1615 +#: lib/psm.c:1607 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1957 +#: lib/psm.c:1949 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr "" -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2319,8 +2327,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2334,7 +2342,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2393,16 +2401,16 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 msgid "(added files)" msgstr "" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 msgid "(added provide)" msgstr "" @@ -2470,102 +2478,102 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "" @@ -2812,36 +2820,36 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:517 +#: lib/verify.c:518 #, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +msgid "Unsatisifed dependencies for %s:" msgstr "" -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/fi.po b/po/fi.po index c7eb0f5bb..1e7ab6b56 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1451,98 +1451,98 @@ msgstr "" msgid " failed - " msgstr "pgp epäonnistui" -#: lib/depends.c:115 +#: lib/depends.c:114 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "virhe: en voi avata %s%s/packages.rpm\n" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 #, fuzzy msgid "(rpmrc provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:675 +#: lib/depends.c:671 #, fuzzy msgid "(rpmlib provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:696 +#: lib/depends.c:692 #, fuzzy msgid "(db files)" msgstr "en voinut avata %s: %s" -#: lib/depends.c:708 +#: lib/depends.c:704 #, fuzzy msgid "(db provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:721 +#: lib/depends.c:717 #, fuzzy msgid "(db package)" msgstr "kysele kaikki paketit" -#: lib/depends.c:760 +#: lib/depends.c:756 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2203,67 +2203,77 @@ msgstr "allekirjoita paketti (hylk msgid "generate signature" msgstr "generoi PGP-allekirjoitus" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" -msgstr "vaatii %s-%s-%s\n" - -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +#, fuzzy +msgid "conflicts with" msgstr " on ristiriidassa %s-%s-%s:n kanssa\n" -#: lib/problems.c:268 +#: lib/problems.c:201 +#, fuzzy +msgid "is needed by" +msgstr "vaatii %s-%s-%s\n" + +#: lib/problems.c:244 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/problems.c:273 +#: lib/problems.c:249 #, 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:278 +#: lib/problems.c:254 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paketti %s ei ole asennettu\n" -#: lib/problems.c:283 +#: lib/problems.c:259 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paketti %s ei ole asennettu\n" -#: lib/problems.c:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:269 #, 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:298 +#: lib/problems.c:274 #, 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:303 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:294 #, 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:325 +#: lib/problems.c:298 +#, fuzzy, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "paketti %s ei ole %s:ssä" + +#: lib/problems.c:302 +#, fuzzy, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "paketti %s ei ole %s:ssä" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" @@ -2316,61 +2326,61 @@ msgstr "en voinut avata tiedostoa %s: " msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1322 #, fuzzy msgid "source package contains no .spec file\n" msgstr "kysy pakettia, jonka omistuksessa on" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "älä suorita mitään vaiheita" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, 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:1615 +#: lib/psm.c:1607 #, 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:1957 +#: lib/psm.c:1949 #, 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:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr "" -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp epäonnistui" @@ -2420,8 +2430,8 @@ msgstr "paketilla ei ole nime msgid "can't query %s: %s\n" msgstr "virhe: en voi avata %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" @@ -2435,7 +2445,7 @@ msgstr "%s:n kysely ei onnistunut\n" msgid "old format source packages cannot be queried\n" msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: readLead epäonnistui\n" @@ -2495,17 +2505,17 @@ msgstr "virheellinen paketin numero: %s\n" msgid "record %u could not be read\n" msgstr "tietuetta %d ei voitu lukea\n" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 #, fuzzy msgid "(added files)" msgstr "en voinut avata %s: %s" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 #, fuzzy msgid "(added provide)" msgstr "tiedostoa %s ei omista mikään paketti\n" @@ -2576,104 +2586,104 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, fuzzy, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 #, fuzzy msgid "Preparing packages for installation..." msgstr "asennukselle ei määritelty paketteja" -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "Haen: %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "virhe: %s ei voida asentaa\n" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "puuttuvat riippuvuudet:\n" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 #, fuzzy msgid "installing binary packages\n" msgstr "asenna paketti" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" määrittää useita paketteja\n" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "virhe: en voi avata %s\n" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "Asennan: %s\n" @@ -2934,36 +2944,36 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:420 +#: lib/verify.c:421 #, fuzzy, c-format msgid "missing %s" msgstr "puuttuva '{' '%':n jälkeen" -#: lib/verify.c:517 -#, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +#: lib/verify.c:518 +#, fuzzy, c-format +msgid "Unsatisifed dependencies for %s:" msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:" -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/fr.po b/po/fr.po index 9f4fcffc6..9f76d5d38 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1491,95 +1491,95 @@ msgstr "" msgid " failed - " msgstr "La construction a chou.\n" -#: lib/depends.c:115 +#: lib/depends.c:114 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:675 +#: lib/depends.c:671 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:696 +#: lib/depends.c:692 #, fuzzy msgid "(db files)" msgstr "impossible d'ouvrir: %s\n" -#: lib/depends.c:708 +#: lib/depends.c:704 msgid "(db provides)" msgstr "" -#: lib/depends.c:721 +#: lib/depends.c:717 #, fuzzy msgid "(db package)" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/depends.c:760 +#: lib/depends.c:756 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "impossible d'ouvrir: %s\n" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2253,67 +2253,75 @@ msgstr "" msgid "generate signature" msgstr " --sign - genre une signature PGP" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" +#: lib/problems.c:201 +msgid "conflicts with" msgstr "" -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +msgid "is needed by" msgstr "" -#: lib/problems.c:268 +#: lib/problems.c:244 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:273 +#: lib/problems.c:249 #, 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:278 +#: lib/problems.c:254 #, fuzzy, c-format msgid "package %s is already installed" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:283 +#: lib/problems.c:259 #, 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:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:269 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:274 #, 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:303 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, fuzzy, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "aucun package n'a t spcifi pour l'installation" + +#: lib/problems.c:302 +#, fuzzy, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "aucun package n'a t spcifi pour l'installation" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" @@ -2366,62 +2374,62 @@ msgstr "impossible d'ouvrir: %s\n" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1322 #, fuzzy msgid "source package contains no .spec file\n" msgstr "" " -f + - interroge le package qui appartient " -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1615 +#: lib/psm.c:1607 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1957 +#: lib/psm.c:1949 #, 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:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "La construction a chou.\n" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr "" -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "La construction a chou.\n" @@ -2471,8 +2479,8 @@ msgstr "aucun package n'a t spcifi pour l'installation" msgid "can't query %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "La construction a chou.\n" @@ -2486,7 +2494,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -2546,17 +2554,17 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 #, fuzzy msgid "(added files)" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 msgid "(added provide)" msgstr "" @@ -2625,103 +2633,103 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, fuzzy, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 #, fuzzy msgid "Preparing packages for installation..." msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "" @@ -2979,36 +2987,36 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:517 -#, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " -msgstr "" +#: lib/verify.c:518 +#, fuzzy, c-format +msgid "Unsatisifed dependencies for %s:" +msgstr "impossible d'ouvrir: %s\n" -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/gl.po b/po/gl.po index 43ce4e367..d432e681b 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1405,93 +1405,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:115 +#: lib/depends.c:114 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:675 +#: lib/depends.c:671 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:696 +#: lib/depends.c:692 msgid "(db files)" msgstr "" -#: lib/depends.c:708 +#: lib/depends.c:704 msgid "(db provides)" msgstr "" -#: lib/depends.c:721 +#: lib/depends.c:717 msgid "(db package)" msgstr "" -#: lib/depends.c:760 +#: lib/depends.c:756 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2100,67 +2100,75 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" +#: lib/problems.c:201 +msgid "conflicts with" msgstr "" -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +msgid "is needed by" msgstr "" -#: lib/problems.c:268 +#: lib/problems.c:244 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:273 +#: lib/problems.c:249 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:278 +#: lib/problems.c:254 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:283 +#: lib/problems.c:259 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:269 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:274 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "" + +#: lib/problems.c:302 +#, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" @@ -2213,60 +2221,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1322 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1615 +#: lib/psm.c:1607 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1957 +#: lib/psm.c:1949 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr "" -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2314,8 +2322,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2329,7 +2337,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2388,16 +2396,16 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 msgid "(added files)" msgstr "" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 msgid "(added provide)" msgstr "" @@ -2465,102 +2473,102 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "" @@ -2807,36 +2815,36 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:517 +#: lib/verify.c:518 #, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +msgid "Unsatisifed dependencies for %s:" msgstr "" -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/hu.po b/po/hu.po index 65727bd5b..eef15a11f 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,93 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:115 +#: lib/depends.c:114 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:675 +#: lib/depends.c:671 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:696 +#: lib/depends.c:692 msgid "(db files)" msgstr "" -#: lib/depends.c:708 +#: lib/depends.c:704 msgid "(db provides)" msgstr "" -#: lib/depends.c:721 +#: lib/depends.c:717 msgid "(db package)" msgstr "" -#: lib/depends.c:760 +#: lib/depends.c:756 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2105,67 +2105,75 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" +#: lib/problems.c:201 +msgid "conflicts with" msgstr "" -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +msgid "is needed by" msgstr "" -#: lib/problems.c:268 +#: lib/problems.c:244 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:273 +#: lib/problems.c:249 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:278 +#: lib/problems.c:254 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:283 +#: lib/problems.c:259 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:269 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:274 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "" + +#: lib/problems.c:302 +#, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" @@ -2218,60 +2226,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1322 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1615 +#: lib/psm.c:1607 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1957 +#: lib/psm.c:1949 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr "" -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2319,8 +2327,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2334,7 +2342,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2393,16 +2401,16 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 msgid "(added files)" msgstr "" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 msgid "(added provide)" msgstr "" @@ -2470,102 +2478,102 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "" @@ -2812,36 +2820,36 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:517 +#: lib/verify.c:518 #, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +msgid "Unsatisifed dependencies for %s:" msgstr "" -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/id.po b/po/id.po index 65727bd5b..eef15a11f 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,93 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:115 +#: lib/depends.c:114 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:675 +#: lib/depends.c:671 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:696 +#: lib/depends.c:692 msgid "(db files)" msgstr "" -#: lib/depends.c:708 +#: lib/depends.c:704 msgid "(db provides)" msgstr "" -#: lib/depends.c:721 +#: lib/depends.c:717 msgid "(db package)" msgstr "" -#: lib/depends.c:760 +#: lib/depends.c:756 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2105,67 +2105,75 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" +#: lib/problems.c:201 +msgid "conflicts with" msgstr "" -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +msgid "is needed by" msgstr "" -#: lib/problems.c:268 +#: lib/problems.c:244 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:273 +#: lib/problems.c:249 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:278 +#: lib/problems.c:254 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:283 +#: lib/problems.c:259 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:269 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:274 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "" + +#: lib/problems.c:302 +#, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" @@ -2218,60 +2226,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1322 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1615 +#: lib/psm.c:1607 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1957 +#: lib/psm.c:1949 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr "" -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2319,8 +2327,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2334,7 +2342,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2393,16 +2401,16 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 msgid "(added files)" msgstr "" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 msgid "(added provide)" msgstr "" @@ -2470,102 +2478,102 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "" @@ -2812,36 +2820,36 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:517 +#: lib/verify.c:518 #, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +msgid "Unsatisifed dependencies for %s:" msgstr "" -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/is.po b/po/is.po index 1705d8e9f..b92fc11df 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "Skrifaği: %s\n" @@ -1410,94 +1410,94 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:115 +#: lib/depends.c:114 #, c-format msgid "cannot open Packages database in %s\n" msgstr "get ekki opnağ pakka gagnagrunn í\n" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:675 +#: lib/depends.c:671 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:696 +#: lib/depends.c:692 msgid "(db files)" msgstr "" -#: lib/depends.c:708 +#: lib/depends.c:704 msgid "(db provides)" msgstr "" -#: lib/depends.c:721 +#: lib/depends.c:717 #, fuzzy msgid "(db package)" msgstr "uppfæra pakka" -#: lib/depends.c:760 +#: lib/depends.c:756 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2111,67 +2111,75 @@ msgstr "" msgid "generate signature" msgstr "búa til undirskrift" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" +#: lib/problems.c:201 +msgid "conflicts with" msgstr "" -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +msgid "is needed by" msgstr "" -#: lib/problems.c:268 +#: lib/problems.c:244 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:273 +#: lib/problems.c:249 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:278 +#: lib/problems.c:254 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:283 +#: lib/problems.c:259 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:269 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:274 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "" + +#: lib/problems.c:302 +#, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" @@ -2224,60 +2232,60 @@ msgstr "get ekki rita msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1322 msgid "source package contains no .spec file\n" msgstr "pakkinn inniheldur enga .spec skrá\n" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1615 +#: lib/psm.c:1607 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1957 +#: lib/psm.c:1949 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr "" -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "gat ekki opnağ %s: %s\n" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s brást\n" @@ -2325,8 +2333,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2340,7 +2348,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: gat ekki lesiğ manifest: %s\n" @@ -2399,16 +2407,16 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 msgid "(added files)" msgstr "" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 msgid "(added provide)" msgstr "" @@ -2476,102 +2484,102 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "" @@ -2818,36 +2826,36 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "í pakkanum eru engir notandalistar (şetta ætti aldrei ağ koma fyrir)\n" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "í pakkanum eru engir hópalistar (şetta ætti aldrei ağ koma fyrir)\n" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "vantar %s" -#: lib/verify.c:517 -#, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +#: lib/verify.c:518 +#, fuzzy, c-format +msgid "Unsatisifed dependencies for %s:" msgstr "Óuppfyllt pakkaskilyrği fyrir %s-%s-%s: " -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/it.po b/po/it.po index 65727bd5b..eef15a11f 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,93 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:115 +#: lib/depends.c:114 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:675 +#: lib/depends.c:671 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:696 +#: lib/depends.c:692 msgid "(db files)" msgstr "" -#: lib/depends.c:708 +#: lib/depends.c:704 msgid "(db provides)" msgstr "" -#: lib/depends.c:721 +#: lib/depends.c:717 msgid "(db package)" msgstr "" -#: lib/depends.c:760 +#: lib/depends.c:756 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2105,67 +2105,75 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" +#: lib/problems.c:201 +msgid "conflicts with" msgstr "" -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +msgid "is needed by" msgstr "" -#: lib/problems.c:268 +#: lib/problems.c:244 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:273 +#: lib/problems.c:249 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:278 +#: lib/problems.c:254 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:283 +#: lib/problems.c:259 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:269 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:274 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "" + +#: lib/problems.c:302 +#, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" @@ -2218,60 +2226,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1322 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1615 +#: lib/psm.c:1607 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1957 +#: lib/psm.c:1949 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr "" -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2319,8 +2327,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2334,7 +2342,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2393,16 +2401,16 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 msgid "(added files)" msgstr "" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 msgid "(added provide)" msgstr "" @@ -2470,102 +2478,102 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "" @@ -2812,36 +2820,36 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:517 +#: lib/verify.c:518 #, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +msgid "Unsatisifed dependencies for %s:" msgstr "" -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index 2d6c8e171..34c97eda3 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "½ñ¤­¹ş¤ßÃæ: %s\n" @@ -1483,98 +1483,98 @@ msgstr "" msgid " failed - " msgstr "¼ºÇÔ - " -#: lib/depends.c:115 +#: lib/depends.c:114 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó\n" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤¹" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n" -#: lib/depends.c:675 +#: lib/depends.c:671 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n" -#: lib/depends.c:696 +#: lib/depends.c:692 #, fuzzy msgid "(db files)" msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" -#: lib/depends.c:708 +#: lib/depends.c:704 #, fuzzy msgid "(db provides)" msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n" -#: lib/depends.c:721 +#: lib/depends.c:717 #, fuzzy msgid "(db package)" msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Ş¤·¤¿\n" -#: lib/depends.c:760 +#: lib/depends.c:756 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Ş¤¹\n" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2252,76 +2252,86 @@ msgstr " msgid "generate signature" msgstr "PGP/GPG ½ğ̾¤òÀ¸À®¤·¤Ş¤¹" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" -msgstr "¤Ï %s-%s-%s ¤ËɬÍפȤµ¤ì¤Æ¤¤¤Ş¤¹\n" - -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +#, fuzzy +msgid "conflicts with" msgstr " %s-%s-%s ¤È¶¥¹ç¤·¤Ş¤¹\n" -#: lib/problems.c:268 +#: lib/problems.c:201 +#, fuzzy +msgid "is needed by" +msgstr "¤Ï %s-%s-%s ¤ËɬÍפȤµ¤ì¤Æ¤¤¤Ş¤¹\n" + +#: lib/problems.c:244 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¸ş¤±¤Ç¤¹" -#: lib/problems.c:273 +#: lib/problems.c:249 #, fuzzy, c-format msgid "package %s is for a different operating system" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë OS ¸ş¤±¤Ç¤¹" -#: lib/problems.c:278 +#: lib/problems.c:254 #, fuzzy, c-format msgid "package %s is already installed" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤¹" -#: lib/problems.c:283 +#: lib/problems.c:259 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Ş¤»¤ó" -#: lib/problems.c:288 +#: lib/problems.c:264 #, 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:293 +#: lib/problems.c:269 #, 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:298 +#: lib/problems.c:274 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s (%s-%s-%s¤è¤ê¤â¿·¤·¤¤¤â¤Î) ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş" "¤¹" -#: lib/problems.c:303 +#: lib/problems.c:279 #, fuzzy, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å" "¤Ç)" -#: lib/problems.c:313 +#: lib/problems.c:289 #, fuzzy, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å" "¤Ç)" -#: lib/problems.c:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, fuzzy, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëş¤¿¤µ¤ì¤Æ¤¤¤Ş¤»¤ó: %s\n" + +#: lib/problems.c:302 +#, fuzzy, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëş¤¿¤µ¤ì¤Æ¤¤¤Ş¤»¤ó: %s\n" + +#: lib/problems.c:307 #, fuzzy, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼ %d ¤¬¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤ÎÁàºîÃæ¤Ë¤ª¤­¤Ş¤·¤¿" @@ -2375,62 +2385,62 @@ msgstr "%s msgid "source package expected, binary found\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Ş¤¹¡¢¥Ğ¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Ş¤·¤¿" -#: lib/psm.c:1330 +#: lib/psm.c:1322 #, fuzzy msgid "source package contains no .spec file\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Ş¤ó¤Ç¤¤¤Ş¤»¤ó" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "¥İ¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ğ)¤ò¼Â¹Ô¤·¤Ş¤¹\n" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" -#: lib/psm.c:1615 +#: lib/psm.c:1607 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" -#: lib/psm.c:1957 +#: lib/psm.c:1949 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n" -#: lib/psm.c:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "¥æ¡¼¥¶ %s ¤Ï¸ºß¤·¤Ş¤»¤ó - root ¤ò»ÈÍѤ·¤Ş¤¹" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "¥°¥ë¡¼¥× %s ¤Ï¸ºß¤·¤Ş¤»¤ó - root ¤ò»ÈÍѤ·¤Ş¤¹" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿­Ä¹¤Ë¼ºÇÔ %s%s: %s" -#: lib/psm.c:2239 +#: lib/psm.c:2231 #, fuzzy msgid " on file " msgstr "¥Õ¥¡¥¤¥ë¾å" -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s ¼ºÇÔ" @@ -2479,8 +2489,8 @@ msgstr " msgid "can't query %s: %s\n" msgstr "%s ¤òºï½ü(unlink)¤Ç¤­¤Ş¤»¤ó: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n" @@ -2494,7 +2504,7 @@ msgstr "%s msgid "old format source packages cannot be queried\n" msgstr "µì·Á¼°¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤ë¤³¤È¤Ï¤Ç¤­¤Ş¤»¤ó\n" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n" @@ -2554,17 +2564,17 @@ msgstr " msgid "record %u could not be read\n" msgstr "¥ì¥³¡¼¥É %d ¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿\n" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤»¤ó\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 #, fuzzy msgid "(added files)" msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 #, fuzzy msgid "(added provide)" msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n" @@ -2635,7 +2645,7 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2644,96 +2654,96 @@ msgstr "" "\"B\" ¤Î°Í¸À­¤Ï epoch ¤òɬÍפȤ·¤Ş¤¹(\"A\"¤ÈƱ¤¸¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, fuzzy, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëş¤¿¤µ¤ì¤Æ¤¤¤Ş¤»¤ó: %s\n" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 #, fuzzy msgid "Preparing packages for installation..." msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Ş¤»¤ó" -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "%s ¤ò¼èÆÀ¤·¤Æ¤¤¤Ş¤¹\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr "%s ¤È¤·¤Æ...\n" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s ¤ò¥¹¥­¥Ã¥×¤·¤Ş¤¹ - žÁ÷¼ºÇÔ - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Ş¤»¤ó" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤«¤é¤ÎÆɤ߹ş¤ß¥¨¥é¡¼ " -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¤Ï¤è¤ê¿·¤·¤¤ RPM ¤Î¥Ğ¡¼¥¸¥ç¥ó¤¬É¬ÍפǤ¹\n" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Ş¤»¤ó\n" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ğ¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Ş¤·¤¿\n" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "°Í¸À­¤Î·çÇ¡:\n" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "¥Ğ¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó: %s" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¤ÏÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Æ¤¤¤Ş¤¹\n" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë¤È°Í¸À­¤òÇ˲õ¤·¤Ş¤¹:\n" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó\n" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n" @@ -2994,42 +3004,42 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "½ğ̾¥Ñ¥Ã¥É: %d\n" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥­¥Ã¥×¤·¤Ş¤¹\n" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n" -#: lib/verify.c:242 +#: lib/verify.c:243 #, fuzzy msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸¤Ï ¥æ¡¼¥¶Ì¾¤È id ¥ê¥¹¥È¤ÎξÊı¤¬·ç¤±¤Æ¤¤¤Ş¤¹(¤³¤ì¤Ï·è¤·¤Æµ¯¤­¤Æ¤Ï¤Ê" "¤é¤Ê¤¤)" -#: lib/verify.c:263 +#: lib/verify.c:264 #, fuzzy msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸¤Ï¥°¥ë¡¼¥×̾¤È id ¥ê¥¹¥È¤ÎξÊı¤¬·ç¤±¤Æ¤¤¤Ş¤¹(¤³¤ì¤Ï·è¤·¤Æµ¯¤­¤Æ¤Ï¤Ê" "¤é¤Ê¤¤)" -#: lib/verify.c:420 +#: lib/verify.c:421 #, fuzzy, c-format msgid "missing %s" msgstr "%s ¤¬¸«¤Ä¤«¤ê¤Ş¤»¤ó\n" -#: lib/verify.c:517 -#, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +#: lib/verify.c:518 +#, fuzzy, c-format +msgid "Unsatisifed dependencies for %s:" msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À­¤òËş¤¿¤·¤Æ¤¤¤Ş¤»¤ó:" -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/ko.po b/po/ko.po index ac1417f37..410eee1ec 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "ÀÛ¼º: %s\n" @@ -1423,99 +1423,99 @@ msgstr " msgid " failed - " msgstr " ½ÇÆĞÇÔ - " -#: lib/depends.c:115 +#: lib/depends.c:114 #, c-format msgid "cannot open Packages database in %s\n" msgstr "%s ¾ÈÀÇ ÆĞÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "%s ÆĞÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s ¿¹ (rpmrcÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:675 +#: lib/depends.c:671 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s ¿¹ (rpmlibÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:696 +#: lib/depends.c:692 #, fuzzy msgid "(db files)" msgstr "À߸øµÈ db ÆÄÀÏ %s\n" -#: lib/depends.c:708 +#: lib/depends.c:704 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n" -#: lib/depends.c:721 +#: lib/depends.c:717 #, fuzzy msgid "(db package)" msgstr "ÆĞÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/depends.c:760 +#: lib/depends.c:756 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) ÀÇÁ¸(Depends) ij½Ã¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù.\n" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "¾Æ´Ï¿À" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "¿¹" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort °ü°è¿¡¼­ %s-%s-%s \"%s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== ÆĞÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼­, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, ±íÀÌ[depth])\n" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "========== ÈÄÀÓÀÚ [successors only] (Ç¥Çö ¼ø)\n" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "·çÇÁ(LOOP):\n" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2144,72 +2144,82 @@ msgstr " msgid "generate signature" msgstr "¼­¸íÀ» ÀÛ¼ºÇÕ´Ï´Ù" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" -msgstr " (Àº)´Â %s-%s-%s ¿¡¼­ ÇÊ¿ä·Î ÇÕ´Ï´Ù\n" - -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +#, fuzzy +msgid "conflicts with" msgstr " %s-%s-%s (¿Í)°ú Ãæµ¹ÇÕ´Ï´Ù\n" -#: lib/problems.c:268 +#: lib/problems.c:201 +#, fuzzy +msgid "is needed by" +msgstr " (Àº)´Â %s-%s-%s ¿¡¼­ ÇÊ¿ä·Î ÇÕ´Ï´Ù\n" + +#: lib/problems.c:244 #, c-format msgid "package %s is for a different architecture" msgstr "%s (Àº)´Â ´Ù¸¥ ¾ÆÅ°ÅØÃĸ¦ À§ÇÑ ÆĞÅ°ÁöÀÔ´Ï´Ù" -#: lib/problems.c:273 +#: lib/problems.c:249 #, c-format msgid "package %s is for a different operating system" msgstr "%s (Àº)´Â ´Ù¸¥ ¿î¿µÃ¼Á¦¸¦ À§ÇÑ ÆĞÅ°ÁöÀÔ´Ï´Ù" -#: lib/problems.c:278 +#: lib/problems.c:254 #, c-format msgid "package %s is already installed" msgstr "%s ÆĞÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/problems.c:283 +#: lib/problems.c:259 #, c-format msgid "path %s in package %s is not relocateable" msgstr "%2$s ÆĞÅ°Áö ¾ÈÀÇ %1$s °æ·Î´Â Àç¹èÄ¡ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: lib/problems.c:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "%2$s (¿Í)°ú %3$s ÀÇ ¼³Ä¡ °úÁ¤¿¡¼­ %1$s ÆÄÀÏÀÌ ¼­·Î Ãæµ¹ÇÕ´Ï´Ù" -#: lib/problems.c:293 +#: lib/problems.c:269 #, 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:298 +#: lib/problems.c:274 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "%s ÆĞÅ°Áö (%s º¸´Ù ÃÖ½ÅÀÇ ÆĞÅ°Áö)´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/problems.c:303 +#: lib/problems.c:279 #, 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:313 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" "%3$s ÆÄÀϽýºÅÛ »ó¿¡¼­ %1$s ÆĞÅ°Áö¸¦ ¼³Ä¡ÇÒ °æ¿ì¿¡´Â %2$ld ÀÇ ¾ÆÀ̳ëµå(inode)" "°¡ ÇÊ¿äÇÕ´Ï´Ù" -#: lib/problems.c:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" "%s ÆĞÅ°ÁöÀÇ ¼±(pre)-Æ®·£Àè¼Ç ½Ã½ºÅÛÄİ(syscall): %s (ÀÌ)°¡ ½ÇÆĞÇß½À´Ï´Ù: %s" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, fuzzy, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "%s-%s-%s ÆĞÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n" + +#: lib/problems.c:302 +#, fuzzy, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "%s-%s-%s ÆĞÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" @@ -2263,66 +2273,66 @@ msgstr "%%%s %s ( msgid "source package expected, binary found\n" msgstr "¼Ò½º ÆĞÅ°Áö°¡ ¿ä±¸µË´Ï´Ù, ¹ÙÀ̳ʸ®¸¦ ã¾Ò½À´Ï´Ù\n" -#: lib/psm.c:1330 +#: lib/psm.c:1322 msgid "source package contains no .spec file\n" msgstr "¼Ò½º ÆĞÅ°Áö¿¡ .spec ÆÄÀÏÀÌ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: %s ½ºÅ©¸³Æ®¸¦ ½ÇÇàÇÕ´Ï´Ù (ÀÖÀ» °æ¿ì)\n" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, 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:1615 +#: lib/psm.c:1607 #, 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:1957 +#: lib/psm.c:1949 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s (ÀÌ)°¡ %d ÀÇ ÆÄÀÏÀ» °®°í ÀÖ½À´Ï´Ù, Å×½ºÆ® = %d\n" -#: lib/psm.c:2074 +#: lib/psm.c:2066 #, 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:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "%s »ç¿ëÀÚ°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, c-format msgid "group %s does not exist - using root\n" msgstr "%s ±×·ìÀÌ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¾ÆÄ«À̺긦 Ǫ´Âµ¥ ½ÇÆĞÇÔ%s%s: %s\n" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr " ´ÙÀ½ ÆÄÀÏ¿¡ " -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%2$s ÆÄÀÏÀÇ %1$s (ÀÌ)°¡ ½ÇÆĞÇÔ: %3$s\n" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, c-format msgid "%s failed: %s\n" msgstr "%s (ÀÌ)°¡ ½ÇÆĞÇÔ: %s\n" @@ -2370,8 +2380,8 @@ msgstr " msgid "can't query %s: %s\n" msgstr "%s (À»)¸¦ ÁúÀÇÇÒ ¼ö ¾øÀ½: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "%s (À»)¸¦ ¿©´Âµ¥ ½ÇÆĞÇÔ: %s\n" @@ -2385,7 +2395,7 @@ msgstr "%s ( msgid "old format source packages cannot be queried\n" msgstr "ÀÌÀü Çü½ÄÀÇ ¼Ò½º ÆĞÅ°Áö´Â ÁúÀÇÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: Àдµ¥ ½ÇÆĞÇß½À´Ï´Ù: %s\n" @@ -2444,17 +2454,17 @@ msgstr " msgid "record %u could not be read\n" msgstr "±â·Ï(record) ¹øÈ£ %u (Àº)´Â ÀĞÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "%s ÆĞÅ°Áö´Â ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 #, fuzzy msgid "(added files)" msgstr "À߸øµÈ db ÆÄÀÏ %s\n" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n" @@ -2523,7 +2533,7 @@ msgid "OK" msgstr "È®ÀÎ" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2532,95 +2542,95 @@ msgstr "" "\"B\" ÀÇÁ¸¼ºÀº Áß¿ä½Ã µÇ´Â °Í(epoch)À» ÇÊ¿ä·Î ÇÕ´Ï´Ù (\"A\" ·Î °¡Á¤ÇÕ´Ï´Ù)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, fuzzy, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "%s-%s-%s ÆĞÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "Áغñ Áß..." -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 msgid "Preparing packages for installation..." msgstr "¼³Ä¡ÇÒ ÆĞÅ°Áö¸¦ ÁغñÇÏ°í ÀÖ½À´Ï´Ù..." -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "%s (À»)¸¦ º¹±¸ÇÕ´Ï´Ù\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr " ... %s (À¸)·Î\n" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s (À»)¸¦ »ı·«ÇÕ´Ï´Ù - Àü¼Û(transfer)¿¡ ½ÇÆĞÇÔ - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "%s ÆĞÅ°Áö´Â Àç¹èÄ¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "%s ÆÄÀÏÀ» ÀĞ´Â µµÁß ¿À·ù°¡ ¹ß»ıÇß½À´Ï´Ù\n" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "%s ÆÄÀÏÀÌ ÃֽŠ¹öÀüÀÇ RPMÀ» ÇÊ¿ä·Î ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "%s (Àº)´Â ¼³Ä¡µÉ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "%d ÀÇ ¼Ò½º¿Í %d ÀÇ ¹ÙÀ̳ʸ® ÆĞÅ°Áö¸¦ ã¾Ò½À´Ï´Ù\n" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇØ ½ÇÆĞÇÔ:\n" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "¹ÙÀ̳ʸ® ÆĞÅ°Áö¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, c-format msgid "cannot open file %s: %s\n" msgstr "%s ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¿©·¯°³ÀÇ ÆĞÅ°Áö¸¦ ÁöÁ¤ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "ÀÌ ÆĞÅ°ÁöµéÀ» Á¦°ÅÇϸé ÀÇÁ¸¼ºÀÌ ±úÁú ¼ö ÀÖÀ½:\n" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, c-format msgid "cannot open %s: %s\n" msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "%s (À»)¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n" @@ -2870,38 +2880,38 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "¼­¸í: size(%d)+pad(%d)\n" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "missingok Ç÷¡±×·Î ÀÎÇØ %s (À»)¸¦ »ı·«ÇÕ´Ï´Ù\n" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "%s µğ·ºÅ丮¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" "ÆĞÅ°Áö¿¡ »ç¿ëÀÚ À̸§°ú id ¸ñ·ÏÀÌ ¾ø½À´Ï´Ù (Àı´ë ÀÌ·¸°Ô µÇ¾î¼­´Â ¾ÈµË´Ï´Ù)\n" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" "ÆĞÅ°Áö¿¡ ±×·ì À̸§°ú id ¸ñ·ÏÀÌ ¾ø½À´Ï´Ù (Àı´ë ÀÌ·¸°Ô µÇ¾î¼­´Â ¾ÈµË´Ï´Ù)\n" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "´ÙÀ½À» ãÀ» ¼ö ¾ø½À´Ï´Ù %s" -#: lib/verify.c:517 -#, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +#: lib/verify.c:518 +#, fuzzy, c-format +msgid "Unsatisifed dependencies for %s:" msgstr "%s-%s-%s ¿¡ ÀÇÁ¸¼º ¹®Á¦ ¹ß»ı: " -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/no.po b/po/no.po index 096a334a2..8e18e02ab 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1424,94 +1424,94 @@ msgstr "" msgid " failed - " msgstr " feilet - " -#: lib/depends.c:115 +#: lib/depends.c:114 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kan ikke åpne pakkedatabase i %s\n" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "pakke %s er allerede installert" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:675 +#: lib/depends.c:671 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:696 +#: lib/depends.c:692 msgid "(db files)" msgstr "" -#: lib/depends.c:708 +#: lib/depends.c:704 msgid "(db provides)" msgstr "" -#: lib/depends.c:721 +#: lib/depends.c:717 #, fuzzy msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:760 +#: lib/depends.c:756 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "NEI" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "JA" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2133,67 +2133,77 @@ msgstr "signer en pakke (forkast n msgid "generate signature" msgstr "generer signatur" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" -msgstr " kreves av %s-%s-%s\n" - -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +#, fuzzy +msgid "conflicts with" msgstr " er i konflikt med %s-%s-%s\n" -#: lib/problems.c:268 +#: lib/problems.c:201 +#, fuzzy +msgid "is needed by" +msgstr " kreves av %s-%s-%s\n" + +#: lib/problems.c:244 #, c-format msgid "package %s is for a different architecture" msgstr "pakke %s er for en annen arkitektur" -#: lib/problems.c:273 +#: lib/problems.c:249 #, c-format msgid "package %s is for a different operating system" msgstr "pakke %s er for et annet operativsystem" -#: lib/problems.c:278 +#: lib/problems.c:254 #, c-format msgid "package %s is already installed" msgstr "pakke %s er allerede installert" -#: lib/problems.c:283 +#: lib/problems.c:259 #, c-format msgid "path %s in package %s is not relocateable" msgstr "sti %s i pakke %s kan ikke relokeres" -#: lib/problems.c:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:269 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:274 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, fuzzy, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "pakke %s er i konflikt: %s\n" + +#: lib/problems.c:302 +#, fuzzy, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "pakke %s er i konflikt: %s\n" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" @@ -2246,60 +2256,60 @@ msgstr "kan ikke skrive til %%%s %s\n" msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binær funnet\n" -#: lib/psm.c:1330 +#: lib/psm.c:1322 msgid "source package contains no .spec file\n" msgstr "kildepakke inneholder ikke en .spec-fil\n" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: kjører %s-skript (hvis noen)\n" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1615 +#: lib/psm.c:1607 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1957 +#: lib/psm.c:1949 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr "" -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "klarte ikke å åpne %s: %s\n" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s feilet\n" @@ -2347,8 +2357,8 @@ msgstr "pakken har verken fileier eller id-lister\n" msgid "can't query %s: %s\n" msgstr "kan ikke spørre på %s: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "feil under åpning av %s: %s\n" @@ -2362,7 +2372,7 @@ msgstr "sp msgid "old format source packages cannot be queried\n" msgstr "kildepakker i gammelt format kan ikke spørres\n" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: lesing av manifest feilet: %s\n" @@ -2421,16 +2431,16 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "pakke %s er ikke installert\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 msgid "(added files)" msgstr "" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 msgid "(added provide)" msgstr "" @@ -2498,102 +2508,102 @@ msgid "OK" msgstr "OK" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, fuzzy, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "pakke %s er i konflikt: %s\n" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "Forbereder..." -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 msgid "Preparing packages for installation..." msgstr "Forbereder pakker for installasjon..." -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "Henter %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr " ... som %s\n" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "hopper over %s - overføring feilet - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "pakke %s kan ikke relokeres\n" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "feil under lesing fra fil %s\n" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "fil %s trenger en nyere versjon av RPM\n" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "fant %d kilde- og %d binærpakker\n" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "feilede avhengigheter:\n" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "installerer binærpakker\n" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" spesifiserer flere pakker\n" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "fjerning av disse pakkene vil ødelegge avhengigheter:\n" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, c-format msgid "cannot open %s: %s\n" msgstr "kan ikke åpne %s: %s\n" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" @@ -2842,36 +2852,36 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer katalog %s\n" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "mangler %s" -#: lib/verify.c:517 -#, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " -msgstr "" +#: lib/verify.c:518 +#, fuzzy, c-format +msgid "Unsatisifed dependencies for %s:" +msgstr "feilede avhengigheter:\n" -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/pl.po b/po/pl.po index 71b5dbdce..f493972ec 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -1465,99 +1465,99 @@ msgstr "" msgid " failed - " msgstr " nie powiod³o siê -" -#: lib/depends.c:115 +#: lib/depends.c:114 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 #, fuzzy msgid "(rpmrc provides)" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:675 +#: lib/depends.c:671 #, fuzzy msgid "(rpmlib provides)" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:696 +#: lib/depends.c:692 #, fuzzy msgid "(db files)" msgstr "b³êdny status pliku: %s" -#: lib/depends.c:708 +#: lib/depends.c:704 #, fuzzy msgid "(db provides)" msgstr "Udostêpniane zasoby:" -#: lib/depends.c:721 +#: lib/depends.c:717 #, fuzzy msgid "(db package)" msgstr "znaleziono %d pakietów\n" -#: lib/depends.c:760 +#: lib/depends.c:756 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 #, fuzzy msgid "NO " msgstr "NIE DOBRZE" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "usuwanie indeksu grupy\n" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2217,69 +2217,79 @@ msgstr "podpisz pakiet (porzu msgid "generate signature" msgstr "generuj sygnaturê PGP/GPG" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" -msgstr " jest wymagany przez %s-%s-%s\n" - -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +#, fuzzy +msgid "conflicts with" msgstr " jest w konflikcie z %s-%s-%s\n" -#: lib/problems.c:268 +#: lib/problems.c:201 +#, fuzzy +msgid "is needed by" +msgstr " jest wymagany przez %s-%s-%s\n" + +#: lib/problems.c:244 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "pakiet %s-%s-%s zbudowano dla innej architektury" -#: lib/problems.c:273 +#: lib/problems.c:249 #, 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:278 +#: lib/problems.c:254 #, fuzzy, c-format msgid "package %s is already installed" msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany" -#: lib/problems.c:283 +#: lib/problems.c:259 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "pakiet %s nie jest przesuwalny\n" -#: lib/problems.c:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:269 #, 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:298 +#: lib/problems.c:274 #, 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:303 +#: lib/problems.c:279 #, 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:313 +#: lib/problems.c:289 #, 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:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, fuzzy, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n" + +#: lib/problems.c:302 +#, fuzzy, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n" + +#: lib/problems.c:307 #, 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" @@ -2333,61 +2343,61 @@ msgstr "nie mo msgid "source package expected, binary found\n" msgstr "spodziewany pakiet ¼ród³owy a nie binarny" -#: lib/psm.c:1330 +#: lib/psm.c:1322 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pakiet ¼ród³owy nie zawiera pliku .spec" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, 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:1615 +#: lib/psm.c:1607 #, 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:1957 +#: lib/psm.c:1949 #, 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:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, 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:2197 +#: lib/psm.c:2189 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s nie istnieje - u¿yto grupy root" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, 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:2239 +#: lib/psm.c:2231 msgid " on file " msgstr " na pliku " -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nie mo¿na otworzyæ %s: %s" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s nie powiod³o siê" @@ -2436,8 +2446,8 @@ msgstr "pakiet nie ma ani w msgid "can't query %s: %s\n" msgstr "nie mo¿na odwi±zaæ %s: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "otwarcie %s nie powiod³o siê\n" @@ -2451,7 +2461,7 @@ msgstr "odpytywanie %s nie powiod msgid "old format source packages cannot be queried\n" msgstr "pakiety w starym formacie nie mog± byæ odpytywane\n" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: readLead nie powiod³o siê\n" @@ -2511,17 +2521,17 @@ msgstr "numer rekordu pakietu: %d\n" msgid "record %u could not be read\n" msgstr "nie mo¿na odczytaæ rekordu %d\n" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "pakiet %s nie jest zainstalowany\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 #, fuzzy msgid "(added files)" msgstr "b³êdny status pliku: %s" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 #, fuzzy msgid "(added provide)" msgstr "Udostêpniane zasoby:" @@ -2591,103 +2601,103 @@ msgid "OK" msgstr "OK" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, fuzzy, c-format msgid " %s A %s\tB %s\n" msgstr " rpm {--version}" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, fuzzy, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 #, fuzzy msgid "Preparing packages for installation..." msgstr "nie podano nazw plików do zainstalowania" -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "¦ci±ganie %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr "... jako %s\n" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s pomijany - transmisja %s nie powiod³a siê\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "pakiet %s nie jest przesuwalny\n" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "b³±d czytania z pliku %s\n" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "plik %s wymaga nowszej wersji RPM\n" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie mo¿e byæ zainstalowany\n" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "znaleziono %d pakietów ¼ród³owych i %d binarnych\n" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "niespe³nione zale¿no¶ci:\n" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "instalacja pakietów binarnych\n" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nie mo¿na otworzyæ pliku %s: %s" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" okre¶la wiele pakietów\n" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "usuniêcie tych pakietów zerwie zale¿no¶ci:\n" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie mo¿na otworzyæ %s\n" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "Instalacja %s\n" @@ -2947,42 +2957,42 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Blok sygnatury: %d\n" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s pominiêty z powodu flagi missingok\n" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: lib/verify.c:242 +#: lib/verify.c:243 #, fuzzy msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" "pakiet nie specyfikuje ani nazwy u¿ytkownika ani list id (to nie powinno siê " "zdarzyæ)" -#: lib/verify.c:263 +#: lib/verify.c:264 #, fuzzy msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" "pakiet nie specyfikuje ani nazwy grupy ani list id (to nie powinno siê " "zdarzyæ)" -#: lib/verify.c:420 +#: lib/verify.c:421 #, fuzzy, c-format msgid "missing %s" msgstr "brak %s\n" -#: lib/verify.c:517 -#, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +#: lib/verify.c:518 +#, fuzzy, c-format +msgid "Unsatisifed dependencies for %s:" msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: " -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/pt.po b/po/pt.po index 769399b8e..793a6fd8c 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "Gravei: %s\n" @@ -1420,99 +1420,99 @@ msgstr "" msgid " failed - " msgstr " falhou - " -#: lib/depends.c:115 +#: lib/depends.c:114 #, c-format msgid "cannot open Packages database in %s\n" msgstr "não consigo abrir a base de dados Packages em %s\n" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "o pacote %s já está instalado" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s SIM (oferecidos pelo rpmrc)\n" -#: lib/depends.c:675 +#: lib/depends.c:671 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s SIM (oferecidos pela rpmlib)\n" -#: lib/depends.c:696 +#: lib/depends.c:692 #, fuzzy msgid "(db files)" msgstr "ficheiro db inválido %s\n" -#: lib/depends.c:708 +#: lib/depends.c:704 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s SI (oferecidos pelo db)\n" -#: lib/depends.c:721 +#: lib/depends.c:717 #, fuzzy msgid "(db package)" msgstr "nenhum pacote\n" -#: lib/depends.c:760 +#: lib/depends.c:756 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) adicionado à cache de dependências.\n" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 #, fuzzy msgid "NO " msgstr "NÃO-OK" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "a remover o %s-%s-%s \"%s\" das relações do tsort.\n" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "=========== a guardar as relações do tsort\n" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "========== só os sucessores (ordem de apresentação)\n" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "CICLO:\n" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "========== a prosseguir o tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2147,67 +2147,77 @@ msgstr "assinar um pacote (retira a assinatura actual)" msgid "generate signature" msgstr "gerar a assinatura PGP/GPG" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" -msgstr " é necessário pelo %s-%s-%s\n" - -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +#, fuzzy +msgid "conflicts with" msgstr " está em conflito com o %s-%s-%s\n" -#: lib/problems.c:268 +#: lib/problems.c:201 +#, fuzzy +msgid "is needed by" +msgstr " é necessário pelo %s-%s-%s\n" + +#: lib/problems.c:244 #, c-format msgid "package %s is for a different architecture" msgstr "o pacote %s é para uma arquitectura diferente" -#: lib/problems.c:273 +#: lib/problems.c:249 #, c-format msgid "package %s is for a different operating system" msgstr "o pacote %s é para um sistema operativo diferente" -#: lib/problems.c:278 +#: lib/problems.c:254 #, c-format msgid "package %s is already installed" msgstr "o pacote %s já está instalado" -#: lib/problems.c:283 +#: lib/problems.c:259 #, 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:288 +#: lib/problems.c:264 #, 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:293 +#: lib/problems.c:269 #, 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:298 +#: lib/problems.c:274 #, 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:303 +#: lib/problems.c:279 #, 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:313 +#: lib/problems.c:289 #, 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:318 +#: lib/problems.c:294 #, 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:325 +#: lib/problems.c:298 +#, fuzzy, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "requisito %s-%s-%s do pacote não satisfeito: %s\n" + +#: lib/problems.c:302 +#, fuzzy, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "requisito %s-%s-%s do pacote não satisfeito: %s\n" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "encontrado o erro desconhecido %d ao manipular o pacote %s" @@ -2260,60 +2270,60 @@ msgstr "n msgid "source package expected, binary found\n" msgstr "esperava-se um pacote com código-fonte, foi encontrado um pacote binário\n" -#: lib/psm.c:1330 +#: lib/psm.c:1322 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:1440 +#: lib/psm.c:1432 #, 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:1608 +#: lib/psm.c:1600 #, 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:1615 +#: lib/psm.c:1607 #, 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:1957 +#: lib/psm.c:1949 #, 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:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, 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:2197 +#: lib/psm.c:2189 #, 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:2238 +#: lib/psm.c:2230 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "a abertura do pacote falhou%s%s: %s\n" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr " no ficheiro " -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "falhei ao aceder ao %s: %s\n" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "O %s falhou\n" @@ -2361,8 +2371,8 @@ msgstr "o pacote nem tem um dono do ficheiro ou as listas de IDs\n" msgid "can't query %s: %s\n" msgstr "não consigo pesquisar o %s: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "o acesso ao %s falhou: %s\n" @@ -2376,7 +2386,7 @@ msgstr "a pesquisa do %s falhou\n" msgid "old format source packages cannot be queried\n" msgstr "os pacotes com código-fonte no formato antigo não podem ser pesquisados\n" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: O fread falhou: %s\n" @@ -2435,17 +2445,17 @@ msgstr "n msgid "record %u could not be read\n" msgstr "o registo %d não pôde ser lido\n" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "o pacote %s não está instalado\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 #, fuzzy msgid "(added files)" msgstr "ficheiro db inválido %s\n" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s SI (oferecidos pelo db)\n" @@ -2514,7 +2524,7 @@ msgid "OK" msgstr "OK" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2523,95 +2533,95 @@ msgstr "" "A dependência \"B\" precisa duma época (assumindo a mesma que \"A\")\n" "\t %s\tB %s\n" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, fuzzy, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "requisito %s-%s-%s do pacote não satisfeito: %s\n" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "A preparar..." -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 msgid "Preparing packages for installation..." msgstr "A preparar os pacotes para a instalação..." -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "A obter o %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr " ... como %s\n" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "a ignorar o %s - a transferência falhou - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "o pacote %s não pode ser mudado de sítio\n" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "erro ao ler do ficheiros %s\n" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "o %s precisa duma versão mais recente do RPM\n" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "o %s não pode ser instalado\n" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "encontrados %d pacotes com código-fonte e %d binários\n" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "dependências falhadas:\n" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "a instalar os pacotes binários\n" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, c-format msgid "cannot open file %s: %s\n" msgstr "não consigo aceder ao ficheiro %s: %s\n" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "o \"%s\" especifica vários pacotes\n" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "a remoção destes pacotes irá quebrar dependências:\n" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, c-format msgid "cannot open %s: %s\n" msgstr "não consigo aceder ao %s: %s\n" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "A instalar o %s\n" @@ -2861,36 +2871,36 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "'Pad' ou preenchimento da assinatura: %d\n" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ignorado devido à opção missingok\n" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "a excluir a directoria %s\n" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "o pacote não tem o nome de utilizador nem as listas de IDs (nunca deve ocorrer)\n" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "o pacote não tem o nome do grupo nem as listas de IDs (nunca deve ocorrer)\n" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "falta %s" -#: lib/verify.c:517 -#, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +#: lib/verify.c:518 +#, fuzzy, c-format +msgid "Unsatisifed dependencies for %s:" msgstr "Dependências não satisfeitas para o %s-%s-%s: " -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 177fd9be9..0f6e665de 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1578,97 +1578,97 @@ msgid " failed - " msgstr "Construo falhou.\n" # , c-format -#: lib/depends.c:115 +#: lib/depends.c:114 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "No consegui abrir: %s\n" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "no foi passado pacote para instalao" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:675 +#: lib/depends.c:671 msgid "(rpmlib provides)" msgstr "" # , c-format -#: lib/depends.c:696 +#: lib/depends.c:692 #, fuzzy msgid "(db files)" msgstr "No consegui abrir: %s\n" -#: lib/depends.c:708 +#: lib/depends.c:704 msgid "(db provides)" msgstr "" -#: lib/depends.c:721 +#: lib/depends.c:717 #, fuzzy msgid "(db package)" msgstr "pesquise todos os pacotes" -#: lib/depends.c:760 +#: lib/depends.c:756 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" # , c-format -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "No consegui abrir: %s\n" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2342,67 +2342,75 @@ msgstr "assine um pacote (descarte a assinatura corrente)" msgid "generate signature" msgstr "gere assinatura PGP" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" +#: lib/problems.c:201 +msgid "conflicts with" msgstr "" -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +msgid "is needed by" msgstr "" -#: lib/problems.c:268 +#: lib/problems.c:244 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:273 +#: lib/problems.c:249 #, fuzzy, c-format msgid "package %s is for a different operating system" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:278 +#: lib/problems.c:254 #, fuzzy, c-format msgid "package %s is already installed" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:283 +#: lib/problems.c:259 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:269 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:274 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:303 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, fuzzy, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "no foi passado pacote para instalao" + +#: lib/problems.c:302 +#, fuzzy, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "no foi passado pacote para instalao" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" @@ -2483,62 +2491,62 @@ msgstr "No consegui abrir: %s\n" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1322 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pesquise o pacote ao qual pertence" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "no execute nenhum estgio" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1615 +#: lib/psm.c:1607 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1957 +#: lib/psm.c:1949 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "no foi passado pacote para instalao" -#: lib/psm.c:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "Construo falhou.\n" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "Construo falhou.\n" @@ -2589,8 +2597,8 @@ msgstr "no foi passado pacote para instalao" msgid "can't query %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "Construo falhou.\n" @@ -2605,7 +2613,7 @@ msgid "old format source packages cannot be queried\n" msgstr "" # , c-format -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "No consegui abrir: %s\n" @@ -2665,18 +2673,18 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "no foi passado pacote para instalao" # , c-format -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 #, fuzzy msgid "(added files)" msgstr "No consegui abrir: %s\n" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 msgid "(added provide)" msgstr "" @@ -2748,29 +2756,29 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, fuzzy, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "no foi passado pacote para instalao" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 #, fuzzy msgid "Preparing packages for installation..." msgstr "no foi passado pacote para instalao" @@ -2783,81 +2791,81 @@ msgstr "no foi passado pacote para instalao" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, fuzzy, c-format msgid "Retrieving %s\n" msgstr "RPM verso %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "no foi passado pacote para instalao" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "no foi passado pacote para instalao" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 #, fuzzy msgid "failed dependencies:\n" msgstr "lista dependncias do pacote" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 #, fuzzy msgid "installing binary packages\n" msgstr "instale pacote" # , c-format -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 #, fuzzy msgid "removing these packages would break dependencies:\n" msgstr "lista dependncias do pacote" # , c-format -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "" @@ -3126,7 +3134,7 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3140,30 +3148,30 @@ msgstr "" # "Content-Transfer-Encoding: 8-bit\n" # , c-format #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "RPM verso %s\n" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:517 -#, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " -msgstr "" +#: lib/verify.c:518 +#, fuzzy, c-format +msgid "Unsatisifed dependencies for %s:" +msgstr "lista dependncias do pacote" -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/ro.po b/po/ro.po index 87e3facc4..85f88a304 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1405,93 +1405,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:115 +#: lib/depends.c:114 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:675 +#: lib/depends.c:671 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:696 +#: lib/depends.c:692 msgid "(db files)" msgstr "" -#: lib/depends.c:708 +#: lib/depends.c:704 msgid "(db provides)" msgstr "" -#: lib/depends.c:721 +#: lib/depends.c:717 msgid "(db package)" msgstr "" -#: lib/depends.c:760 +#: lib/depends.c:756 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2100,67 +2100,75 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" +#: lib/problems.c:201 +msgid "conflicts with" msgstr "" -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +msgid "is needed by" msgstr "" -#: lib/problems.c:268 +#: lib/problems.c:244 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:273 +#: lib/problems.c:249 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:278 +#: lib/problems.c:254 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:283 +#: lib/problems.c:259 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:269 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:274 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "" + +#: lib/problems.c:302 +#, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" @@ -2213,60 +2221,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1322 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1615 +#: lib/psm.c:1607 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1957 +#: lib/psm.c:1949 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr "" -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2314,8 +2322,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2329,7 +2337,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2388,16 +2396,16 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 msgid "(added files)" msgstr "" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 msgid "(added provide)" msgstr "" @@ -2465,102 +2473,102 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "" @@ -2807,36 +2815,36 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:517 +#: lib/verify.c:518 #, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +msgid "Unsatisifed dependencies for %s:" msgstr "" -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index 758de748a..03a7a2f02 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-11-07 19:23-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1410,93 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:115 +#: lib/depends.c:114 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:631 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:656 +#: lib/depends.c:655 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:672 +#: lib/depends.c:671 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:693 +#: lib/depends.c:692 msgid "(db files)" msgstr "" -#: lib/depends.c:705 +#: lib/depends.c:704 msgid "(db provides)" msgstr "" -#: lib/depends.c:718 +#: lib/depends.c:717 msgid "(db package)" msgstr "" -#: lib/depends.c:757 +#: lib/depends.c:756 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:759 lib/rpmds.c:378 lib/rpmds.c:533 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "" -#: lib/depends.c:759 lib/rpmds.c:378 lib/rpmds.c:533 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1098 +#: lib/depends.c:1092 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1344 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1418 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1493 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1554 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1589 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1594 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2105,65 +2105,75 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:200 +#: lib/problems.c:201 msgid "conflicts with" msgstr "" -#: lib/problems.c:200 +#: lib/problems.c:201 msgid "is needed by" msgstr "" -#: lib/problems.c:240 +#: lib/problems.c:244 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:245 +#: lib/problems.c:249 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:250 +#: lib/problems.c:254 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:255 +#: lib/problems.c:259 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:260 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:265 +#: lib/problems.c:269 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:270 +#: lib/problems.c:274 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:275 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:285 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:290 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:297 +#: lib/problems.c:298 +#, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "" + +#: lib/problems.c:302 +#, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" @@ -2468,20 +2478,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:503 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:532 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:554 +#: lib/rpmds.c:552 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2834,12 +2844,12 @@ msgstr "" msgid "missing %s" msgstr "" -#: lib/verify.c:516 +#: lib/verify.c:518 #, c-format msgid "Unsatisifed dependencies for %s:" msgstr "" -#: lib/verify.c:554 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 74fa39b46..aa458b4f7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "úÁĞÉÓÁÎ: %s\n" @@ -1441,100 +1441,100 @@ msgstr " msgid " failed - " msgstr "ÎÅ ÕÄÁÌÏÓØ - " -#: lib/depends.c:115 +#: lib/depends.c:114 #, c-format msgid "cannot open Packages database in %s\n" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "ĞÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s YES (rpmrc provides)\n" -#: lib/depends.c:675 +#: lib/depends.c:671 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s YES (rpmlib provides)\n" -#: lib/depends.c:696 +#: lib/depends.c:692 #, fuzzy msgid "(db files)" msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n" -#: lib/depends.c:708 +#: lib/depends.c:704 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s YES (db provides)\n" -#: lib/depends.c:721 +#: lib/depends.c:717 #, fuzzy msgid "(db package)" msgstr "ÎÅÔ ĞÁËÅÔÏ×\n" -#: lib/depends.c:760 +#: lib/depends.c:756 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) ÄÏÂÁ×ÌÅÎÏ × ËÅÛ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "îåT" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "äá" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕĞÏÒÑÄÏŞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "========== ÚÁĞÉÓØ ÕĞÏÒÑÄÏŞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== ÓÏÒÔÉÒÏ×ËÁ ĞÁËÅÔÏ× (ÏŞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, " "ÇÌÕÂÉÎÁ)\n" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "========== ÔÏÌØËÏ ĞÏÓÌÅÄÏ×ÁÔÅÌÉ (× ĞÏÒÑÄËÅ ĞÒÅÄÓÔÁ×ÌÅÎÉÑ)\n" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "ãéëì:\n" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "========== ĞÒÏÄÏÌÖÅÎÉÅ ÕĞÏÒÑÄÏŞÅÎÉÑ ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2163,67 +2163,77 @@ msgstr " msgid "generate signature" msgstr "ÇÅÎÅÒÉÒÏ×ÁÔØ ĞÏÄĞÉÓØ" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" -msgstr " ÎÕÖÅÎ ÄÌÑ %s-%s-%s\n" - -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +#, fuzzy +msgid "conflicts with" msgstr " ËÏÎÆÌÉËÔÕÅÔ Ó %s-%s-%s\n" -#: lib/problems.c:268 +#: lib/problems.c:201 +#, fuzzy +msgid "is needed by" +msgstr " ÎÕÖÅÎ ÄÌÑ %s-%s-%s\n" + +#: lib/problems.c:244 #, c-format msgid "package %s is for a different architecture" msgstr "ĞÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÁÒÈÉÔÅËÔÕÒÙ" -#: lib/problems.c:273 +#: lib/problems.c:249 #, c-format msgid "package %s is for a different operating system" msgstr "ĞÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÏĞÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ" -#: lib/problems.c:278 +#: lib/problems.c:254 #, c-format msgid "package %s is already installed" msgstr "ĞÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/problems.c:283 +#: lib/problems.c:259 #, c-format msgid "path %s in package %s is not relocateable" msgstr "ĞÕÔØ %s × ĞÁËÅÔÅ %s - ÎÅ ĞÅÒÅÍÅİÁÅÍÙÊ" -#: lib/problems.c:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "ËÏÎÆÌÉËÔ ÆÁÊÌÁ %s ĞÒÉ ĞÏĞÙÔËÁÈ ÕÓÔÁÎÏ×ËÉ %s É %s" -#: lib/problems.c:293 +#: lib/problems.c:269 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "ÆÁÊÌ %s ÉÚ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ ĞÁËÅÔÁ %s ËÏÎÆÌÉËÔÕÅÔ Ó ÆÁÊÌÏÍ ÉÚ ĞÁËÅÔÁ %s" -#: lib/problems.c:298 +#: lib/problems.c:274 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "ĞÁËÅÔ %s (ËÏÔÏÒÙÊ ÎÏ×ÅÅ, ŞÅÍ %s) ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/problems.c:303 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ĞÁËÅÔÁ %s ÎÕÖÎÏ %ld%cb ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s" -#: lib/problems.c:313 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ĞÁËÅÔÁ %s ÎÕÖÎÏ %ld inodes ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s" -#: lib/problems.c:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "ĞÁËÅÔ %s pre-transaction syscall(s): %s: ÏÛÉÂËÁ: %s" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, fuzzy, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "ÔÒÅÂÏ×ÁÎÉÑ ĞÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n" + +#: lib/problems.c:302 +#, fuzzy, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "ÔÒÅÂÏ×ÁÎÉÑ ĞÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ %d ĞÒÉ ÒÁÂÏÔÅ Ó ĞÁËÅÔÏÍ %s" @@ -2276,60 +2286,60 @@ msgstr " msgid "source package expected, binary found\n" msgstr "ÏÂÎÁÒÕÖÅÎ Ä×ÏÉŞÎÙÊ ĞÁËÅÔ ×ÍÅÓÔÏ ÏÖÉÄÁÅÍÏÇÏ ÉÓÈÏÄÎÏÇÏ\n" -#: lib/psm.c:1330 +#: lib/psm.c:1322 msgid "source package contains no .spec file\n" msgstr "ÉÓÈÏÄÎÙÊ ĞÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ ÓĞÅÃÉÆÉËÁÃÉÉ\n" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: ×ÙĞÏÌÎÑÅÔÓÑ ÓÃÅÎÁÒÉÊ %s (ÅÓÌÉ ÅÓÔØ)\n" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, 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:1615 +#: lib/psm.c:1607 #, 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:1957 +#: lib/psm.c:1949 #, 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:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "%s: ÏÛÉÂËÁ ÓÃÅÎÁÒÉÑ %s (%d), %s-%s-%s ĞÒÏĞÕÓËÁÅÔÓÑ\n" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "ĞÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕİÅÓÔ×ÕÅÔ - ÉÓĞÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, c-format msgid "group %s does not exist - using root\n" msgstr "ÇÒÕĞĞÁ %s ÎÅ ÓÕİÅÓÔ×ÕÅÔ - ÉÓĞÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "ÒÁÓĞÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s\n" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr " ÎÁ ÆÁÊÌÅ " -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ÏÛÉÂËÁ ÎÁ ÆÁÊÌÅ %s: %s\n" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, c-format msgid "%s failed: %s\n" msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n" @@ -2377,8 +2387,8 @@ msgstr " msgid "can't query %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁĞÒÏÓÉÔØ %s: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" @@ -2392,7 +2402,7 @@ msgstr " msgid "old format source packages cannot be queried\n" msgstr "ÚÁĞÒÏÓÙ Ë ÉÓÈÏÄÎÙÍ ĞÁËÅÔÁÍ × ÓÔÁÒÏÍ ÆÏÒÍÁÔÅ ÎÅ ĞÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: ÏÛÉÂËÁ ŞÔÅÎÉÑ ÓĞÉÓËÁ ÆÁÊÌÏ×: %s\n" @@ -2451,17 +2461,17 @@ msgstr " msgid "record %u could not be read\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ ÚÁĞÉÓØ %u\n" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "ĞÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 #, fuzzy msgid "(added files)" msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s YES (db provides)\n" @@ -2530,7 +2540,7 @@ msgid "OK" msgstr "Oë" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2539,95 +2549,95 @@ msgstr "" "ÄÌÑ ÚÁ×ÉÓÉÍÏÓÔÉ \"B\" ÎÕÖÎÏ ÕËÁÚÁÔØ \"epoch\" (ÔÁË ÖÅ ËÁË ÄÌÑ \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, fuzzy, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "ÔÒÅÂÏ×ÁÎÉÑ ĞÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "ğÏÄÇÏÔÏ×ËÁ..." -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 msgid "Preparing packages for installation..." msgstr "ğÏÄÇÏÔÏ×ËÁ ĞÁËÅÔÏ× ÄÌÑ ÕÓÔÁÎÏ×ËÉ..." -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "úÁÇÒÕÖÁÅÔÓÑ %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr " ... ËÁË %s\n" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s ĞÒÏĞÕÓËÁÅÔÓÑ - ÏÛÉÂËÁ ĞÅÒÅÄÁŞÉ - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "ĞÁËÅÔ %s - ÎÅ ĞÅÒÅÍÅİÁÅÍÙÊ\n" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "ÏÛÉÂËÁ ŞÔÅÎÉÑ ÉÚ ÆÁÊÌÁ %s\n" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "ÄÌÑ ÆÁÊÌÁ %s ÎÅÏÂÈÏÄÉÍÁ ÂÏÌÅÅ ÎÏ×ÁÑ ×ÅÒÓÉÑ RPM\n" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "ÎÁÊÄÅÎÏ %d ÉÓÈÏÄÎÙÈ É %d ÂÉÎÁÒÎÙÈ ĞÁËÅÔÏ×\n" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÂÉÎÁÒÎÙÅ ĞÁËÅÔÙ\n" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, c-format msgid "cannot open file %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %s: %s\n" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ÚÁÄÁÅÔ ÎÅÓËÏÌØËÏ ĞÁËÅÔÏ×\n" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "ÕÄÁÌÅÎÉÅ ÜÔÉÈ ĞÁËÅÔÏ× ÎÁÒÕÛÉÔ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, c-format msgid "cannot open %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ %s\n" @@ -2878,40 +2888,40 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "ğÏÄĞÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁĞÏÌÎÅÎÉÅ(%d)\n" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ĞÒÏĞÕİÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "ÉÓËÌÀŞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" "× ĞÁËÅÔÅ ÎÅÔ ÎÉ ÉÍÅÎ ĞÏÌØÚÏ×ÁÔÅÌÅÊ, ÎÉ ÓĞÉÓËÁ ÉÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× (ÔÁËÏÇÏ ÎÅ " "ÄÏÌÖÎÏ ÂÙÔØ)\n" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" "× ĞÁËÅÔÅ ÎÅÔ ÎÉ ÉÍÅÎ ÇÒÕĞĞ, ÎÉ ÓĞÉÓËÁ ÉÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× (ÔÁËÏÇÏ ÎÅ ÄÏÌÖÎÏ " "ÂÙÔØ)\n" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ %s" -#: lib/verify.c:517 -#, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +#: lib/verify.c:518 +#, fuzzy, c-format +msgid "Unsatisifed dependencies for %s:" msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: " -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "%s-%s-%s: ÎÅĞÒÁ×ÉÌØÎÁÑ ĞÏÄĞÉÓØ ÏÂÌÁÓÔÉ ÚÁÇÏÌÏ×ËÁ ĞÁËÅÔÁ\n" diff --git a/po/sk.po b/po/sk.po index 667db6162..21ecb4c93 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "Zapísané: %s\n" @@ -1464,99 +1464,99 @@ msgstr "" msgid " failed - " msgstr " zlyhalo - " -#: lib/depends.c:115 +#: lib/depends.c:114 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "nie je mo¾né otvori» %s/packages.rpm\n" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "balík %s nie je nain¹talovanı\n" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 #, fuzzy msgid "(rpmrc provides)" msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n" -#: lib/depends.c:675 +#: lib/depends.c:671 #, fuzzy msgid "(rpmlib provides)" msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n" -#: lib/depends.c:696 +#: lib/depends.c:692 #, fuzzy msgid "(db files)" msgstr "chybnı stav súboru: %s" -#: lib/depends.c:708 +#: lib/depends.c:704 #, fuzzy msgid "(db provides)" msgstr "Poskytuje:" -#: lib/depends.c:721 +#: lib/depends.c:717 #, fuzzy msgid "(db package)" msgstr "nájdenıch %d balíkov\n" -#: lib/depends.c:760 +#: lib/depends.c:756 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 #, fuzzy msgid "NO " msgstr "NIE JE V PORIADKU" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstraòuje sa index skupín\n" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2216,67 +2216,77 @@ msgstr "podp msgid "generate signature" msgstr "vytvori» PGP/GPG podpis" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" -msgstr " je vy¾adované %s-%s-%s\n" - -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +#, fuzzy +msgid "conflicts with" msgstr " koliduje s %s-%s-%s\n" -#: lib/problems.c:268 +#: lib/problems.c:201 +#, fuzzy +msgid "is needed by" +msgstr " je vy¾adované %s-%s-%s\n" + +#: lib/problems.c:244 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "balík %s nie je nain¹talovanı\n" -#: lib/problems.c:273 +#: lib/problems.c:249 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:278 +#: lib/problems.c:254 #, fuzzy, c-format msgid "package %s is already installed" msgstr "balík %s nie je nain¹talovanı\n" -#: lib/problems.c:283 +#: lib/problems.c:259 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "balík %s nie je nain¹talovanı\n" -#: lib/problems.c:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:269 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:274 #, 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:303 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, fuzzy, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" + +#: lib/problems.c:302 +#, fuzzy, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" @@ -2330,61 +2340,61 @@ msgstr "nie je mo msgid "source package expected, binary found\n" msgstr "oèakávanı zdrojovı balík, nájdenı binárny" -#: lib/psm.c:1330 +#: lib/psm.c:1322 #, fuzzy msgid "source package contains no .spec file\n" msgstr "zdrojovı balík neobsahuje ¾iadny .spec súbor" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "vykonanie skriptu zlyhalo" -#: lib/psm.c:1615 +#: lib/psm.c:1607 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "vykonanie skriptu zlyhalo" -#: lib/psm.c:1957 +#: lib/psm.c:1949 #, 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:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "pou¾ívateµ %s neexistuje - pou¾ije sa root" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ije sa root" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalenie archívu zlyhalo%s%s: %s" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr " pre súbor " -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nepodarilo sa otvori» %s: %s" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s zlyhalo" @@ -2433,8 +2443,8 @@ msgstr "bal msgid "can't query %s: %s\n" msgstr "zmazanie %s zlyhalo: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "otvorenie %s zlyhalo\n" @@ -2448,7 +2458,7 @@ msgstr "ot msgid "old format source packages cannot be queried\n" msgstr "nie je mo¾né pıta» sa zdrojovıch balíkov v starom formáte\n" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: readLead zlyhalo\n" @@ -2508,17 +2518,17 @@ msgstr "po msgid "record %u could not be read\n" msgstr "záznam %d nie je mo¾né preèíta»\n" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "balík %s nie je nain¹talovanı\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 #, fuzzy msgid "(added files)" msgstr "chybnı stav súboru: %s" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 #, fuzzy msgid "(added provide)" msgstr "Poskytuje:" @@ -2588,103 +2598,103 @@ msgid "OK" msgstr "V PORIADKU" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, fuzzy, c-format msgid " %s A %s\tB %s\n" msgstr " rpm {--version}" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, fuzzy, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 #, fuzzy msgid "Preparing packages for installation..." msgstr "neboli zadané ¾iadne balíky pre in¹taláciu" -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "Prená¹a sa %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr "... ako %s\n" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s vynechané - prenos zlyhal - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "balík %s nie je nain¹talovanı\n" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "chyba pri vytváraní doèasného súboru %s" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie je mo¾né nain¹talova»\n" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "nájdenıch %d zdrojovıch a %d binárnych balíkov\n" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "nevyrie¹ené závislosti:\n" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "in¹talujú sa binárne balíky\n" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nie je mo¾né otvori» súbor %s: %s" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¹pecifikuje viac balíkov\n" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "odstránenie tıchto balíkov by poru¹ilo závislosti:\n" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie je mo¾né otvori» %s\n" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "In¹taluje sa %s\n" @@ -2944,42 +2954,42 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Doplnenie podpisu: %d\n" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s vynechané kvôli príznaku missingok\n" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "vytvára sa adresár %s\n" -#: lib/verify.c:242 +#: lib/verify.c:243 #, fuzzy msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" "v balíku chıba tak meno pou¾ívateµa, ako aj zoznamy identifikácií (nemalo by " "sa nikdy sta»)" -#: lib/verify.c:263 +#: lib/verify.c:264 #, fuzzy msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" "v balíku chıba tak meno skupiny, ako aj zoznamy identifikácií (nemalo by sa " "nikdy sta»)" -#: lib/verify.c:420 +#: lib/verify.c:421 #, fuzzy, c-format msgid "missing %s" msgstr "chıbajúce %s\n" -#: lib/verify.c:517 -#, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +#: lib/verify.c:518 +#, fuzzy, c-format +msgid "Unsatisifed dependencies for %s:" msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: " -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/sl.po b/po/sl.po index 7a64af47a..b360ac4c3 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.193 2001/11/06 22:46:53 jbj Exp $ +# $Id: sl.po,v 1.194 2001/11/08 22:05:18 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -1465,99 +1465,99 @@ msgstr "" msgid " failed - " msgstr " neuspe¹no - " -#: lib/depends.c:115 +#: lib/depends.c:114 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "zbirko podatkov paketov ni mo¾no odpreti v %s\n" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paket %s-%s-%s je ¾e name¹èen" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s DA (rpmrc ponudbe)\n" -#: lib/depends.c:675 +#: lib/depends.c:671 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s DA (rpmlib ponudbe)\n" -#: lib/depends.c:696 +#: lib/depends.c:692 #, fuzzy msgid "(db files)" msgstr "po¹kodovana zbirka podatkov %s" -#: lib/depends.c:708 +#: lib/depends.c:704 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s DA (db ponudbe)\n" -#: lib/depends.c:721 +#: lib/depends.c:717 #, fuzzy msgid "(db package)" msgstr "ni paketov\n" -#: lib/depends.c:760 +#: lib/depends.c:756 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 #, fuzzy msgid "NO " msgstr "NI DOBRO" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstranjujemo seznam skupin\n" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2214,68 +2214,78 @@ msgstr "podpi msgid "generate signature" msgstr "izdelava podpisa PGP/GPG" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" -msgstr " potrebuje %s-%s-%s\n" - -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +#, fuzzy +msgid "conflicts with" msgstr " je v sporu z %s-%s-%s\n" -#: lib/problems.c:268 +#: lib/problems.c:201 +#, fuzzy +msgid "is needed by" +msgstr " potrebuje %s-%s-%s\n" + +#: lib/problems.c:244 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "paket %s-%s-%s je za drug tip arhitekture" -#: lib/problems.c:273 +#: lib/problems.c:249 #, 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:278 +#: lib/problems.c:254 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paket %s-%s-%s je ¾e name¹èen" -#: lib/problems.c:283 +#: lib/problems.c:259 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paketa %s ni mo¾no prestaviti\n" -#: lib/problems.c:288 +#: lib/problems.c:264 #, 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:293 +#: lib/problems.c:269 #, 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:298 +#: lib/problems.c:274 #, 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:303 +#: lib/problems.c:279 #, 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:313 +#: lib/problems.c:289 #, 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:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, fuzzy, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" + +#: lib/problems.c:302 +#, fuzzy, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" + +#: lib/problems.c:307 #, fuzzy, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "neznana napaka %d ob rokovanju s paketom %s-%s-%s" @@ -2329,61 +2339,61 @@ msgstr "pisanje na %s ni mo msgid "source package expected, binary found\n" msgstr "prièakovan je bil izvorni paket, najden binarni" -#: lib/psm.c:1330 +#: lib/psm.c:1322 #, fuzzy msgid "source package contains no .spec file\n" msgstr "izvorni paket ne vsebuje datoteke .spec" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "poganjanje ponamestitvenih skript (èe obstajajo)\n" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, 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:1615 +#: lib/psm.c:1607 #, 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:1957 +#: lib/psm.c:1949 #, 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:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "uporabnik %s ne obstaja - uporabljam root" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s ne obstaja - uporabljam root" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, 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:2239 +#: lib/psm.c:2231 msgid " on file " msgstr " za datoteko " -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspe¹no odpiranje %s: %s\n" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s neuspe¹en" @@ -2432,8 +2442,8 @@ msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id" msgid "can't query %s: %s\n" msgstr "ni mo¾no poizvedeti o %s: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "odpiranje %s je bilo neuspe¹no: %s\n" @@ -2447,7 +2457,7 @@ msgstr "poizvedba po %s je bila neuspe msgid "old format source packages cannot be queried\n" msgstr "poizvedba po izvornih paketih v stari obliki ni mo¾na\n" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: branje Fread je bilo neuspe¹no: %s\n" @@ -2507,17 +2517,17 @@ msgstr " msgid "record %u could not be read\n" msgstr "zapisa %d ni mo¾no prebrati\n" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "paket %s ni name¹èen\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 #, fuzzy msgid "(added files)" msgstr "po¹kodovana zbirka podatkov %s" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s DA (db ponudbe)\n" @@ -2586,7 +2596,7 @@ msgid "OK" msgstr "V REDU" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2595,96 +2605,96 @@ msgstr "" "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, fuzzy, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 #, fuzzy msgid "Preparing packages for installation..." msgstr "paketi za namestitev niso navedeni" -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "Prena¹anje %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr " ... kot %s\n" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "preskoèeno - %s - prenos neuspe¹en - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "paketa %s ni mo¾no premakniti\n" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "napaka pri branju iz datoteke %s\n" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "datoteka %s zahteva novej¹o razlièico RPM\n" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "%s ni mo¾no namestiti\n" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "najdeno %d izvornih in %d binarnih paketov\n" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "neuspe¹ne soodvisnosti:\n" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "name¹èanje binarnih paketov\n" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, c-format msgid "cannot open file %s: %s\n" msgstr "ni mo¾no odpreti datoteke %s: %s\n" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" doloèa veè paketov\n" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, c-format msgid "cannot open %s: %s\n" msgstr "ni mo¾no odpreti %s: %s\n" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "Name¹èanje %s\n" @@ -2942,40 +2952,40 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Dol¾. polnila : %d\n" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s preskoèen zaradi manjkajoèe zastavice OK\n" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "izkljuèevanje imenika %s\n" -#: lib/verify.c:242 +#: lib/verify.c:243 #, fuzzy msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" "v paketu manjka tako seznam uporabnikov kot identitet (to se ne sme zgoditi)" -#: lib/verify.c:263 +#: lib/verify.c:264 #, fuzzy msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" "v paketu manjka tako seznam skupin kot identitet (to se ne sme zgoditi)" -#: lib/verify.c:420 +#: lib/verify.c:421 #, fuzzy, c-format msgid "missing %s" msgstr "manjka %s\n" -#: lib/verify.c:517 -#, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +#: lib/verify.c:518 +#, fuzzy, c-format +msgid "Unsatisifed dependencies for %s:" msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: " -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/sr.po b/po/sr.po index f0dbefa13..b7d4ffcc4 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1449,98 +1449,98 @@ msgstr "" msgid " failed - " msgstr "PGP omanuo" -#: lib/depends.c:115 +#: lib/depends.c:114 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paket %s nije instaliran\n" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 #, fuzzy msgid "(rpmrc provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:675 +#: lib/depends.c:671 #, fuzzy msgid "(rpmlib provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:696 +#: lib/depends.c:692 #, fuzzy msgid "(db files)" msgstr "neuspelo otvaranje %s: %s" -#: lib/depends.c:708 +#: lib/depends.c:704 #, fuzzy msgid "(db provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:721 +#: lib/depends.c:717 #, fuzzy msgid "(db package)" msgstr "upit nad svim paketima" -#: lib/depends.c:760 +#: lib/depends.c:756 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2202,67 +2202,77 @@ msgstr "potpi msgid "generate signature" msgstr "napravi PGP potpis" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" -msgstr " je potreban paketu %s-%s-%s\n" - -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +#, fuzzy +msgid "conflicts with" msgstr " se sudara sa %s-%s-%s\n" -#: lib/problems.c:268 +#: lib/problems.c:201 +#, fuzzy +msgid "is needed by" +msgstr " je potreban paketu %s-%s-%s\n" + +#: lib/problems.c:244 #, fuzzy, c-format msgid "package %s is for a different architecture" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/problems.c:273 +#: lib/problems.c:249 #, 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:278 +#: lib/problems.c:254 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paket %s nije instaliran\n" -#: lib/problems.c:283 +#: lib/problems.c:259 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paket %s nije instaliran\n" -#: lib/problems.c:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:269 #, 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:298 +#: lib/problems.c:274 #, 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:303 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:294 #, 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:325 +#: lib/problems.c:298 +#, fuzzy, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "paket %s nije naveden u %s" + +#: lib/problems.c:302 +#, fuzzy, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "paket %s nije naveden u %s" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" @@ -2315,61 +2325,61 @@ msgstr "Ne mogu da otvorim datoteku %s: " msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1322 #, fuzzy msgid "source package contains no .spec file\n" msgstr "upit nad paketom koji ima " -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "nemoj izvr¹iti nijednu fazu" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, 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:1615 +#: lib/psm.c:1607 #, 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:1957 +#: lib/psm.c:1949 #, 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:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr "" -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "PGP omanuo" @@ -2419,8 +2429,8 @@ msgstr "paket nema imena" msgid "can't query %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "neuspelo otvaranje %s: %s\n" @@ -2434,7 +2444,7 @@ msgstr "upit nad %s neuspeo\n" msgid "old format source packages cannot be queried\n" msgstr "Upit se ne mo¾e izvesti nad izvorni paketima u starom formatu\n" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: Neuspeo 'readLead'\n" @@ -2494,17 +2504,17 @@ msgstr "pogre msgid "record %u could not be read\n" msgstr "ne mogu da proèitam slog %d\n" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "paket %s nije instaliran\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 #, fuzzy msgid "(added files)" msgstr "neuspelo otvaranje %s: %s" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 #, fuzzy msgid "(added provide)" msgstr "datoteka %s ne pripada nijednom paketu\n" @@ -2575,104 +2585,104 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, fuzzy, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s nije naveden u %s" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 #, fuzzy msgid "Preparing packages for installation..." msgstr "nedostaje paket za instalaciju" -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "Pribavljam %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "gre¹ka: preskaèem %s - neuspelo preno¹enje - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, fuzzy, c-format msgid "package %s is not relocateable\n" msgstr "paket %s nije instaliran\n" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "gre¹ka: %s se ne mo¾e instalirati\n" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "lo¹e meğuzavisnosti:\n" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 #, fuzzy msgid "installing binary packages\n" msgstr "instaliraj paket" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" odreğuje vi¹e paketa\n" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "uklanjanje oviha paketa æe naru¹iti zavisnosti:\n" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "Instaliram %s\n" @@ -2933,36 +2943,36 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:420 +#: lib/verify.c:421 #, fuzzy, c-format msgid "missing %s" msgstr "nedostaje { posle %" -#: lib/verify.c:517 -#, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +#: lib/verify.c:518 +#, fuzzy, c-format +msgid "Unsatisifed dependencies for %s:" msgstr "Nezadovoljene meğuzavisnosti za %s-%s-%s: " -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/sv.po b/po/sv.po index 1367781b2..025bcb7e7 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1426,99 +1426,99 @@ msgstr "Ingen arkivfilen i huvud" msgid " failed - " msgstr " misslyckades - " -#: lib/depends.c:115 +#: lib/depends.c:114 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kan inte öppna paketdatabas i %s\n" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paket %s är redan installerat" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n" -#: lib/depends.c:675 +#: lib/depends.c:671 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s JA (rpmlib tillhandahåller)\n" -#: lib/depends.c:696 +#: lib/depends.c:692 #, fuzzy msgid "(db files)" msgstr "felaktig db-fil %s\n" -#: lib/depends.c:708 +#: lib/depends.c:704 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s JA (db-tillhandahållande)\n" -#: lib/depends.c:721 +#: lib/depends.c:717 #, fuzzy msgid "(db package)" msgstr "inga paket\n" -#: lib/depends.c:760 +#: lib/depends.c:756 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) tillagt till beroendecachen.\n" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "NEJ " -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "JA" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tar bort %s-%s-%s \"%s\" från tsort-relationer.\n" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "========== noterar alla relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== tsort:erar paket (ordning, #föregångare, #efterföljare, djup)\n" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "========== endast efterföljare (presentationsordning)\n" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "LOOP:\n" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "========== fortsätter med tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2146,67 +2146,77 @@ msgstr "signera ett paket (sl msgid "generate signature" msgstr "generera signatur" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" -msgstr " behövs av %s-%s-%s\n" - -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +#, fuzzy +msgid "conflicts with" msgstr " står i konflikt med %s-%s-%s\n" -#: lib/problems.c:268 +#: lib/problems.c:201 +#, fuzzy +msgid "is needed by" +msgstr " behövs av %s-%s-%s\n" + +#: lib/problems.c:244 #, c-format msgid "package %s is for a different architecture" msgstr "paket %s är för en annan arkitektur" -#: lib/problems.c:273 +#: lib/problems.c:249 #, c-format msgid "package %s is for a different operating system" msgstr "paket %s är för ett annat operativsystem" -#: lib/problems.c:278 +#: lib/problems.c:254 #, c-format msgid "package %s is already installed" msgstr "paket %s är redan installerat" -#: lib/problems.c:283 +#: lib/problems.c:259 #, 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:288 +#: lib/problems.c:264 #, 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:293 +#: lib/problems.c:269 #, 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:298 +#: lib/problems.c:274 #, 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:303 +#: lib/problems.c:279 #, 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:313 +#: lib/problems.c:289 #, 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:318 +#: lib/problems.c:294 #, 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:325 +#: lib/problems.c:298 +#, fuzzy, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n" + +#: lib/problems.c:302 +#, fuzzy, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "okänt fel %d uppträdde under behandling av paket %s" @@ -2259,61 +2269,61 @@ msgstr "kan inte skriva till %%%s %s\n" msgid "source package expected, binary found\n" msgstr "källpaket förväntades, fann binärpaket\n" -#: lib/psm.c:1330 +#: lib/psm.c:1322 msgid "source package contains no .spec file\n" msgstr "källpaket innehåller ingen .spec-fil\n" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: kör (eventuellt) %s-skript\n" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, 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:1615 +#: lib/psm.c:1607 #, 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:1957 +#: lib/psm.c:1949 #, 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:2074 +#: lib/psm.c:2066 #, 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:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "användare %s finns inte - använder root\n" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, c-format msgid "group %s does not exist - using root\n" msgstr "grupp %s finns inte - använder root\n" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "uppackning av arkiv misslyckades%s%s: %s\n" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr " vid fil " -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s misslyckades på fil %s: %s\n" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, c-format msgid "%s failed: %s\n" msgstr "%s misslyckades: %s\n" @@ -2361,8 +2371,8 @@ msgstr "paketet har varken fil msgid "can't query %s: %s\n" msgstr "kan inte fråga %s: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "misslyckades med att öppna %s: %s\n" @@ -2376,7 +2386,7 @@ msgstr "fr msgid "old format source packages cannot be queried\n" msgstr "källpaket i gammalt format går inte att fråga om\n" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: läsning av paketlista misslyckades: %s\n" @@ -2435,17 +2445,17 @@ msgstr "paketpost nummer: %u\n" msgid "record %u could not be read\n" msgstr "post %u kunde inte läsas\n" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "paket %s är inte installerat\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 #, fuzzy msgid "(added files)" msgstr "felaktig db-fil %s\n" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s JA (db-tillhandahållande)\n" @@ -2514,7 +2524,7 @@ msgid "OK" msgstr "OK" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2523,95 +2533,95 @@ msgstr "" "\"B\"-beroendet behöver en epok (antar samma som \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, fuzzy, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "Förbereder..." -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 msgid "Preparing packages for installation..." msgstr "Förbereder paket för installation ..." -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "Hämtar %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr " ... som %s\n" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "hoppar över %s - överföring misslyckades - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "paket %s är inte relokerbart\n" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "fel vid läsning från fil %s\n" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "filen %s behöver en nyare version av RPM\n" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "%s kan inte installeras\n" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "hittade %d käll- och %d binärpaket\n" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "ouppfyllda beroenden:\n" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "installerar binärpaket\n" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, c-format msgid "cannot open file %s: %s\n" msgstr "kan inte öppna filen %s: %s\n" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" anger flera paket\n" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "att ta bort dessa paket skulle göra sönder beroenden:\n" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "Installerar %s\n" @@ -2863,39 +2873,39 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s överhoppad på grund av missingok-flagga\n" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "hoppar över katalogen %s\n" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" "paketet saknar både användarnamn och id-listor (detta borde aldrig " "inträffa)\n" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" "paketet saknar både gruppnamn och id-listor (detta borde aldrig inträffa)\n" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "saknas %s" -#: lib/verify.c:517 -#, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +#: lib/verify.c:518 +#, fuzzy, c-format +msgid "Unsatisifed dependencies for %s:" msgstr "Ouppfyllda beroenden för %s-%s-%s: " -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "%s-%s-%s: kontrollsumma för oföränderlig huvudregion misslyckades\n" diff --git a/po/tr.po b/po/tr.po index 37ede1efd..f14a2d331 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "Yazıldı: %s\n" @@ -1446,99 +1446,99 @@ msgstr "" msgid " failed - " msgstr " başarısız - " -#: lib/depends.c:115 +#: lib/depends.c:114 #, c-format msgid "cannot open Packages database in %s\n" msgstr "%s de Paket veritabanı açılamadı\n" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "%s zaten kurulu" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s EVET (rpmrc sağlar)\n" -#: lib/depends.c:675 +#: lib/depends.c:671 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s EVET (rpmlib sağlar)\n" -#: lib/depends.c:696 +#: lib/depends.c:692 #, fuzzy msgid "(db files)" msgstr "db dosyası %s hatalı\n" -#: lib/depends.c:708 +#: lib/depends.c:704 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s EVET (db sağlar)\n" -#: lib/depends.c:721 +#: lib/depends.c:717 #, fuzzy msgid "(db package)" msgstr "paket yok\n" -#: lib/depends.c:760 +#: lib/depends.c:756 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) Bağımlılar alanına eklendi.\n" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "HAYIR " -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "EVET" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort bağıntılarından %s-%s-%s \"%s\" kaldırılıyor\n" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "========== tsort bağıntıları kaydediliyor\n" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== paketler tsort'lanıyor (sıra, #öncüller, #ardıllar, derinlik)\n" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "========== sadece ardıllar (sunum sırası)\n" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "ÇEVRİM:\n" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "========== tsort sürüyor ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2170,67 +2170,77 @@ msgstr "paketi imzalar (mevcut imza kald msgid "generate signature" msgstr "imza üretir" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" -msgstr " %s-%s-%s için gerekli\n" - -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +#, fuzzy +msgid "conflicts with" msgstr " %s-%s-%s ile çelişiyor\n" -#: lib/problems.c:268 +#: lib/problems.c:201 +#, fuzzy +msgid "is needed by" +msgstr " %s-%s-%s için gerekli\n" + +#: lib/problems.c:244 #, c-format msgid "package %s is for a different architecture" msgstr "%s farklı bir mimari için" -#: lib/problems.c:273 +#: lib/problems.c:249 #, c-format msgid "package %s is for a different operating system" msgstr "%s farklı bir işletim sistemi için" -#: lib/problems.c:278 +#: lib/problems.c:254 #, c-format msgid "package %s is already installed" msgstr "%s zaten kurulu" -#: lib/problems.c:283 +#: lib/problems.c:259 #, c-format msgid "path %s in package %s is not relocateable" msgstr "%s dosya yolu %s paketinde yeniden konumlandırılamaz" -#: lib/problems.c:288 +#: lib/problems.c:264 #, 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:293 +#: lib/problems.c:269 #, 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:298 +#: lib/problems.c:274 #, 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:303 +#: lib/problems.c:279 #, 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:313 +#: lib/problems.c:289 #, 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:318 +#: lib/problems.c:294 #, 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:325 +#: lib/problems.c:298 +#, fuzzy, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "paket %s-%s-%s gereksinimi tatmin edici değil: %s\n" + +#: lib/problems.c:302 +#, fuzzy, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "paket %s-%s-%s gereksinimi tatmin edici değil: %s\n" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "anlaşılamayan %d hatası, %s paketi işlenirken saptandı" @@ -2283,60 +2293,60 @@ msgstr "%%%s dosyas msgid "source package expected, binary found\n" msgstr "kaynak paketi gerekirken çalıştırılabilir paketi bulundu\n" -#: lib/psm.c:1330 +#: lib/psm.c:1322 msgid "source package contains no .spec file\n" msgstr "kaynak paketi .spec dosyası içermiyor\n" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: %s betiği çalıştırılıyor (varsa)\n" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, 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:1615 +#: lib/psm.c:1607 #, 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:1957 +#: lib/psm.c:1949 #, 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:2074 +#: lib/psm.c:2066 #, 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:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "kullanıcı %s yok - root kullanılacak\n" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, c-format msgid "group %s does not exist - using root\n" msgstr "grup %s yok - root kullanılacak\n" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, 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:2239 +#: lib/psm.c:2231 msgid " on file " msgstr " dosyada " -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s açılamadı: %s\n" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s başarısız\n" @@ -2384,8 +2394,8 @@ msgstr "paket ne dosya sahibi ne de kimlik listesi i msgid "can't query %s: %s\n" msgstr "%s sorgulanamıyor: %s\n" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "%s açılamadı: %s\n" @@ -2399,7 +2409,7 @@ msgstr "%s 'nin sorgulamas msgid "old format source packages cannot be queried\n" msgstr "eski biçem kaynak paketleri sorgulanamaz\n" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: bildirge okuma başarısız: %s\n" @@ -2458,17 +2468,17 @@ msgstr "paket kay msgid "record %u could not be read\n" msgstr "%u. kayıt okunamadı\n" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "%s paketi kurulu değil\n" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 #, fuzzy msgid "(added files)" msgstr "db dosyası %s hatalı\n" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s EVET (db sağlar)\n" @@ -2537,7 +2547,7 @@ msgid "OK" msgstr "Tamam" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, fuzzy, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2546,95 +2556,95 @@ msgstr "" "\"B\" bağımlılığı bir dönemsellik gerektirir (tabii ki \"A\" da)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, fuzzy, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s-%s-%s gereksinimi tatmin edici değil: %s\n" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "Hazırlanıyor..." -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 msgid "Preparing packages for installation..." msgstr "Kurulacak paketler hazırlanıyor..." -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "%s alınıyor\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr "... %s olarak\n" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s atlanıyor - aktarım başarısız - %s\n" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "%s paketi yeniden konumlandırılamaz\n" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "%s dosyasından okuma hatalı\n" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "%s dosyası RPM'nin daha yeni bir sürümünü gerektiriyor\n" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "%s yüklenemedi\n" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "%d kaynak ve %d icra edilebilir paketi bulundu\n" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "bağımlılıklarda hata; gerekli paketler:\n" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "icra edilebilir paketleri kuruluyor\n" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, c-format msgid "cannot open file %s: %s\n" msgstr "%s dosyası açılamadı: %s\n" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" birden fazla paketi tanımlıyor\n" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "bu paketin silinmesi aşağıdakilerin bağımlılıklarını etkileyecektir:\n" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, c-format msgid "cannot open %s: %s\n" msgstr "%s açılamadı: %s\n" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "%s kuruluyor\n" @@ -2884,39 +2894,39 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "İmza: boyut(%d)+iz(%d)\n" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "missingok flamasından dolayı %s atlandı\n" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "%s dizini dışlanıyor\n" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" "paket hem kullanıcı ismi hem de kimlik listelerinden yoksun (bu hiç iyi " "değil)\n" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" "paket hem grup ismi hem de kimlik listelerinden yoksun (bu hiç iyi değil)\n" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "eksik %s" -#: lib/verify.c:517 -#, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +#: lib/verify.c:518 +#, fuzzy, c-format +msgid "Unsatisifed dependencies for %s:" msgstr "%s-%s-%s için tatmin edici olmayan bağımlılıklar: " -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "%s-%s-%s: değişmez başlık alanı özet denetimi başarısız\n" diff --git a/po/uk.po b/po/uk.po index 65727bd5b..eef15a11f 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,93 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:115 +#: lib/depends.c:114 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:675 +#: lib/depends.c:671 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:696 +#: lib/depends.c:692 msgid "(db files)" msgstr "" -#: lib/depends.c:708 +#: lib/depends.c:704 msgid "(db provides)" msgstr "" -#: lib/depends.c:721 +#: lib/depends.c:717 msgid "(db package)" msgstr "" -#: lib/depends.c:760 +#: lib/depends.c:756 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2105,67 +2105,75 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" +#: lib/problems.c:201 +msgid "conflicts with" msgstr "" -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +msgid "is needed by" msgstr "" -#: lib/problems.c:268 +#: lib/problems.c:244 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:273 +#: lib/problems.c:249 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:278 +#: lib/problems.c:254 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:283 +#: lib/problems.c:259 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:269 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:274 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "" + +#: lib/problems.c:302 +#, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" @@ -2218,60 +2226,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1322 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1615 +#: lib/psm.c:1607 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1957 +#: lib/psm.c:1949 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr "" -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2319,8 +2327,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2334,7 +2342,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2393,16 +2401,16 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 msgid "(added files)" msgstr "" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 msgid "(added provide)" msgstr "" @@ -2470,102 +2478,102 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "" @@ -2812,36 +2820,36 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:517 +#: lib/verify.c:518 #, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +msgid "Unsatisifed dependencies for %s:" msgstr "" -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/wa.po b/po/wa.po index 65727bd5b..eef15a11f 100644 --- a/po/wa.po +++ b/po/wa.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,93 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:115 +#: lib/depends.c:114 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:675 +#: lib/depends.c:671 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:696 +#: lib/depends.c:692 msgid "(db files)" msgstr "" -#: lib/depends.c:708 +#: lib/depends.c:704 msgid "(db provides)" msgstr "" -#: lib/depends.c:721 +#: lib/depends.c:717 msgid "(db package)" msgstr "" -#: lib/depends.c:760 +#: lib/depends.c:756 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2105,67 +2105,75 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" +#: lib/problems.c:201 +msgid "conflicts with" msgstr "" -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +msgid "is needed by" msgstr "" -#: lib/problems.c:268 +#: lib/problems.c:244 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:273 +#: lib/problems.c:249 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:278 +#: lib/problems.c:254 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:283 +#: lib/problems.c:259 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:269 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:274 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "" + +#: lib/problems.c:302 +#, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" @@ -2218,60 +2226,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1322 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1615 +#: lib/psm.c:1607 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1957 +#: lib/psm.c:1949 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr "" -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2319,8 +2327,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2334,7 +2342,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2393,16 +2401,16 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 msgid "(added files)" msgstr "" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 msgid "(added provide)" msgstr "" @@ -2470,102 +2478,102 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "" @@ -2812,36 +2820,36 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:517 +#: lib/verify.c:518 #, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +msgid "Unsatisifed dependencies for %s:" msgstr "" -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/zh.po b/po/zh.po index 65727bd5b..eef15a11f 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,93 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:115 +#: lib/depends.c:114 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:675 +#: lib/depends.c:671 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:696 +#: lib/depends.c:692 msgid "(db files)" msgstr "" -#: lib/depends.c:708 +#: lib/depends.c:704 msgid "(db provides)" msgstr "" -#: lib/depends.c:721 +#: lib/depends.c:717 msgid "(db package)" msgstr "" -#: lib/depends.c:760 +#: lib/depends.c:756 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2105,67 +2105,75 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" +#: lib/problems.c:201 +msgid "conflicts with" msgstr "" -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +msgid "is needed by" msgstr "" -#: lib/problems.c:268 +#: lib/problems.c:244 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:273 +#: lib/problems.c:249 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:278 +#: lib/problems.c:254 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:283 +#: lib/problems.c:259 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:269 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:274 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "" + +#: lib/problems.c:302 +#, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" @@ -2218,60 +2226,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1322 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1615 +#: lib/psm.c:1607 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1957 +#: lib/psm.c:1949 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr "" -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2319,8 +2327,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2334,7 +2342,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2393,16 +2401,16 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 msgid "(added files)" msgstr "" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 msgid "(added provide)" msgstr "" @@ -2470,102 +2478,102 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "" @@ -2812,36 +2820,36 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:517 +#: lib/verify.c:518 #, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +msgid "Unsatisifed dependencies for %s:" msgstr "" -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 65727bd5b..eef15a11f 100644 --- a/po/zh_CN.GB2312.po +++ b/po/zh_CN.GB2312.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-06 17:01-0500\n" +"POT-Creation-Date: 2001-11-08 16:51-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:2152 +#: build/pack.c:603 lib/psm.c:2144 #, 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:2417 +#: build/pack.c:683 lib/psm.c:2409 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,93 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:115 +#: lib/depends.c:114 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:333 +#: lib/depends.c:332 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:338 +#: lib/depends.c:337 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:343 +#: lib/depends.c:342 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:634 +#: lib/depends.c:630 msgid "(cached)" msgstr "" -#: lib/depends.c:659 +#: lib/depends.c:655 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:675 +#: lib/depends.c:671 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:696 +#: lib/depends.c:692 msgid "(db files)" msgstr "" -#: lib/depends.c:708 +#: lib/depends.c:704 msgid "(db provides)" msgstr "" -#: lib/depends.c:721 +#: lib/depends.c:717 msgid "(db package)" msgstr "" -#: lib/depends.c:760 +#: lib/depends.c:756 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "NO " msgstr "" -#: lib/depends.c:762 lib/rpmds.c:326 lib/rpmds.c:481 +#: lib/depends.c:758 lib/rpmds.c:375 lib/rpmds.c:530 msgid "YES" msgstr "" -#: lib/depends.c:1103 +#: lib/depends.c:1092 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1345 +#: lib/depends.c:1338 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1419 +#: lib/depends.c:1412 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1494 +#: lib/depends.c:1487 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1555 +#: lib/depends.c:1548 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1590 +#: lib/depends.c:1583 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1595 +#: lib/depends.c:1588 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2105,67 +2105,75 @@ msgstr "" msgid "generate signature" msgstr "" -#: lib/problems.c:225 -#, c-format -msgid " is needed by %s-%s-%s\n" +#: lib/problems.c:201 +msgid "conflicts with" msgstr "" -#: lib/problems.c:228 -#, c-format -msgid " conflicts with %s-%s-%s\n" +#: lib/problems.c:201 +msgid "is needed by" msgstr "" -#: lib/problems.c:268 +#: lib/problems.c:244 #, c-format msgid "package %s is for a different architecture" msgstr "" -#: lib/problems.c:273 +#: lib/problems.c:249 #, c-format msgid "package %s is for a different operating system" msgstr "" -#: lib/problems.c:278 +#: lib/problems.c:254 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:283 +#: lib/problems.c:259 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:264 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:293 +#: lib/problems.c:269 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:298 +#: lib/problems.c:274 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:303 +#: lib/problems.c:279 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:313 +#: lib/problems.c:289 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:318 +#: lib/problems.c:294 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:325 +#: lib/problems.c:298 +#, c-format +msgid "package %s has unsatisfied Requires: %s\n" +msgstr "" + +#: lib/problems.c:302 +#, c-format +msgid "package %s has unsatisfied Conflicts: %s\n" +msgstr "" + +#: lib/problems.c:307 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" @@ -2218,60 +2226,60 @@ msgstr "" msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1330 +#: lib/psm.c:1322 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1440 +#: lib/psm.c:1432 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1608 +#: lib/psm.c:1600 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1615 +#: lib/psm.c:1607 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1957 +#: lib/psm.c:1949 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2074 +#: lib/psm.c:2066 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2188 +#: lib/psm.c:2180 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2197 +#: lib/psm.c:2189 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2238 +#: lib/psm.c:2230 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2239 +#: lib/psm.c:2231 msgid " on file " msgstr "" -#: lib/psm.c:2425 +#: lib/psm.c:2417 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2428 +#: lib/psm.c:2420 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2319,8 +2327,8 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:326 lib/rpminstall.c:466 -#: lib/rpminstall.c:837 +#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470 +#: lib/rpminstall.c:841 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2334,7 +2342,7 @@ msgstr "" msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:648 lib/rpminstall.c:479 +#: lib/query.c:648 lib/rpminstall.c:483 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" @@ -2393,16 +2401,16 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:854 lib/rpminstall.c:625 +#: lib/query.c:854 lib/rpminstall.c:629 #, c-format msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:771 +#: lib/rpmal.c:766 msgid "(added files)" msgstr "" -#: lib/rpmal.c:868 +#: lib/rpmal.c:865 msgid "(added provide)" msgstr "" @@ -2470,102 +2478,102 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:451 +#: lib/rpmds.c:500 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:480 +#: lib/rpmds.c:529 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:506 +#: lib/rpmds.c:552 #, c-format -msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgid "package %s has unsatisfied %s: %s\n" msgstr "" -#: lib/rpminstall.c:153 +#: lib/rpminstall.c:155 msgid "Preparing..." msgstr "" -#: lib/rpminstall.c:155 +#: lib/rpminstall.c:157 msgid "Preparing packages for installation..." msgstr "" -#: lib/rpminstall.c:274 +#: lib/rpminstall.c:276 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:288 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:290 +#: lib/rpminstall.c:292 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" -#: lib/rpminstall.c:388 +#: lib/rpminstall.c:390 #, c-format msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:440 +#: lib/rpminstall.c:444 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:446 +#: lib/rpminstall.c:450 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:458 lib/rpminstall.c:693 +#: lib/rpminstall.c:462 lib/rpminstall.c:697 #, c-format msgid "%s cannot be installed\n" msgstr "" -#: lib/rpminstall.c:494 +#: lib/rpminstall.c:498 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:512 +#: lib/rpminstall.c:516 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:535 +#: lib/rpminstall.c:539 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:558 +#: lib/rpminstall.c:562 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:628 +#: lib/rpminstall.c:632 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:652 +#: lib/rpminstall.c:656 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:679 +#: lib/rpminstall.c:683 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:685 +#: lib/rpminstall.c:689 #, c-format msgid "Installing %s\n" msgstr "" @@ -2812,36 +2820,36 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:247 +#: lib/transaction.c:244 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:886 +#: lib/transaction.c:883 #, c-format msgid "excluding directory %s\n" msgstr "" -#: lib/verify.c:242 +#: lib/verify.c:243 msgid "package lacks both user name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:263 +#: lib/verify.c:264 msgid "package lacks both group name and id lists (this should never happen)\n" msgstr "" -#: lib/verify.c:420 +#: lib/verify.c:421 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:517 +#: lib/verify.c:518 #, c-format -msgid "Unsatisfied dependencies for %s-%s-%s: " +msgid "Unsatisifed dependencies for %s:" msgstr "" -#: lib/verify.c:562 +#: lib/verify.c:556 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" diff --git a/python/rpmmodule.c b/python/rpmmodule.c index 63b2a7237..8f031d791 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -1356,7 +1356,7 @@ static PyObject * rpmtransRemove(rpmtransObject * s, PyObject * args) { /** \ingroup python */ static PyObject * rpmtransDepCheck(rpmtransObject * s, PyObject * args) { - rpmDependencyConflict conflicts, c; + rpmProblem conflicts, c; int numConflicts; PyObject * list, * cf; int i; @@ -1388,15 +1388,15 @@ static PyObject * rpmtransDepCheck(rpmtransObject * s, PyObject * args) { c = conflicts + i; - byName = c->byNEVR; + byName = c->pkgNEVR; if ((byRelease = strrchr(byName, '-')) != NULL) *byRelease++ = '\0'; if ((byVersion = strrchr(byName, '-')) != NULL) *byVersion++ = '\0'; - key = c->suggestedKeys[0]; + key = c->key; - needsName = c->needsNEVR; + needsName = c->altNEVR; if (needsName[1] == ' ') { sense = (needsName[0] == 'C') ? RPMDEP_SENSE_CONFLICTS : RPMDEP_SENSE_REQUIRES; diff --git a/rpm.spec b/rpm.spec index 690095dc7..8eff7047e 100644 --- a/rpm.spec +++ b/rpm.spec @@ -382,6 +382,7 @@ fi %lang(fr) %{__prefix}/*/locale/fr/LC_MESSAGES/rpm.mo %lang(is) %{__prefix}/*/locale/is/LC_MESSAGES/rpm.mo %lang(ja) %{__prefix}/*/locale/ja/LC_MESSAGES/rpm.mo +%lang(ko) %{__prefix}/*/locale/ko/LC_MESSAGES/rpm.mo %lang(no) %{__prefix}/*/locale/no/LC_MESSAGES/rpm.mo %lang(pl) %{__prefix}/*/locale/pl/LC_MESSAGES/rpm.mo %lang(pt) %{__prefix}/*/locale/pt/LC_MESSAGES/rpm.mo @@ -490,6 +491,7 @@ fi %lang(gl) %{__prefix}/*/locale/gl/LC_MESSAGES/popt.mo %lang(hu) %{__prefix}/*/locale/hu/LC_MESSAGES/popt.mo %lang(is) %{__prefix}/*/locale/is/LC_MESSAGES/popt.mo +%lang(ko) %{__prefix}/*/locale/ko/LC_MESSAGES/popt.mo %lang(no) %{__prefix}/*/locale/no/LC_MESSAGES/popt.mo %lang(pt) %{__prefix}/*/locale/pt/LC_MESSAGES/popt.mo %lang(ro) %{__prefix}/*/locale/ro/LC_MESSAGES/popt.mo @@ -557,3 +559,10 @@ fi - depends.h: hack around teIterator() et al from include for now. - rpmds: move trigger dependencies into a rpmDepSet as well. - rpmal: availablePackage is totally opaque, alKey with index replaces. +- fix: harmless typo in db3 chroot hack. +- fix: big-endian's with sizeof(time_t) != sizeof(int_32) mtime broken. +- fix: add Korean message catalogs (#54473). +- add RPHNPLATFORM and PLATFORM tags. +- linear search on added package provides is dumb. +- discarding entire signature header when using --addsign is dumb. +- rip out rpmDependencyConflict, replace with rpmProblem instead. diff --git a/rpm.spec.in b/rpm.spec.in index b51a97876..2f50df8d7 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -565,3 +565,4 @@ fi - add RPHNPLATFORM and PLATFORM tags. - linear search on added package provides is dumb. - discarding entire signature header when using --addsign is dumb. +- rip out rpmDependencyConflict, replace with rpmProblem instead. -- cgit v1.2.3