From e3c57cf71efb077e28106cdaeb6ecc7910ca7aae Mon Sep 17 00:00:00 2001 From: jbj Date: Sat, 13 Apr 2002 18:52:18 +0000 Subject: [PATCH] - merge conflicts into problems, handle as transaction set variable. CVS patchset: 5402 CVS date: 2002/04/13 18:52:18 --- CHANGES | 1 + build.c | 16 ++++--- lib/depends.c | 15 +------ lib/problems.c | 35 +++++----------- lib/rpminstall.c | 77 ++++++++++++++++------------------ lib/rpmlib.h | 41 +++++++----------- lib/rpmts.c | 21 ++++++++++ lib/rpmts.h | 8 ++-- lib/transaction.c | 3 +- lib/ts.c | 16 ++++--- lib/verify.c | 28 +++++++------ po/cs.po | 100 ++++++++++++++++++++++---------------------- po/da.po | 100 ++++++++++++++++++++++---------------------- po/de.po | 99 ++++++++++++++++++++++--------------------- po/fi.po | 99 ++++++++++++++++++++++--------------------- po/fr.po | 96 ++++++++++++++++++++---------------------- po/gl.po | 96 ++++++++++++++++++++---------------------- po/is.po | 97 +++++++++++++++++++++--------------------- po/ja.po | 99 ++++++++++++++++++++++--------------------- po/ko.po | 100 ++++++++++++++++++++++---------------------- po/no.po | 100 ++++++++++++++++++++++---------------------- po/pl.po | 100 ++++++++++++++++++++++---------------------- po/pt_BR.po | 101 ++++++++++++++++++++++---------------------- po/ro.po | 96 ++++++++++++++++++++---------------------- po/rpm.pot | 96 ++++++++++++++++++++---------------------- po/ru.po | 100 ++++++++++++++++++++++---------------------- po/sk.po | 99 ++++++++++++++++++++++--------------------- po/sl.po | 102 ++++++++++++++++++++++----------------------- po/sr.po | 99 ++++++++++++++++++++++--------------------- po/sv.po | 100 ++++++++++++++++++++++---------------------- po/tr.po | 100 ++++++++++++++++++++++---------------------- python/rpmmodule.c | 48 +++++++++++---------- rpm.spec | 3 ++ rpm.spec.in | 3 ++ rpmdb/.lclintrc | 2 +- rpmio/ugid.c | 3 +- tools/rpmsort.c | 15 +++---- 37 files changed, 1137 insertions(+), 1177 deletions(-) diff --git a/CHANGES b/CHANGES index 0c1d99604..f9f451821 100644 --- a/CHANGES +++ b/CHANGES @@ -100,6 +100,7 @@ - beecrypt: add types.h, eliminate need for config.gnu.h. - rescusitate --rebuild. - use rpmdb-redhat to suggest dependency resolution(s). + - merge conflicts into problems, handle as transaction set variable. 4.0.3 -> 4.0.4: - solaris: translate i86pc to i386 (#57182). diff --git a/build.c b/build.c index 1a577f95a..f24322e9a 100644 --- a/build.c +++ b/build.c @@ -23,8 +23,7 @@ static int checkSpec(rpmTransactionSet ts, Header h) /*@globals fileSystem, internalState @*/ /*@modifies ts, h, fileSystem, internalState @*/ { - rpmProblem conflicts; - int numConflicts; + rpmProblemSet ps; int rc; if (!headerIsEntry(h, RPMTAG_REQUIRENAME) @@ -33,15 +32,14 @@ static int checkSpec(rpmTransactionSet ts, Header h) rc = rpmtransAddPackage(ts, h, NULL, 0, NULL); - rc = rpmdepCheck(ts, &conflicts, &numConflicts); - /*@-branchstate@*/ - if (rc == 0 && conflicts) { - rpmMessage(RPMMESS_ERROR, _("failed build dependencies:\n")); - printDepProblems(stderr, conflicts, numConflicts); - conflicts = rpmdepFreeConflicts(conflicts, numConflicts); + rc = rpmdepCheck(ts); + ps = rpmtsGetProblems(ts); + if (rc == 0 && ps) { + rpmMessage(RPMMESS_ERROR, _("Failed build dependencies:\n")); + printDepProblems(stderr, ps); rc = 1; } - /*@=branchstate@*/ + ps = rpmProblemSetFree(ps); /* XXX nuke the added package. */ rpmtransClean(ts); diff --git a/lib/depends.c b/lib/depends.c index 27d75137d..d9f4c9d6e 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -1595,8 +1595,7 @@ static int rpmdbCloseDBI(/*@null@*/ rpmdb db, int rpmtag) } /*@=mustmod =type@*/ -int rpmdepCheck(rpmTransactionSet ts, - rpmProblem * dsprobs, int * numProbs) +int rpmdepCheck(rpmTransactionSet ts) { rpmdbMatchIterator mi = NULL; teIterator pi = NULL; transactionElement p; @@ -1611,11 +1610,9 @@ int rpmdepCheck(rpmTransactionSet ts, closeatexit = 1; } + ts->probs = rpmProblemSetFree(ts->probs); ts->probs = rpmProblemSetCreate(); - *dsprobs = NULL; - *numProbs = 0; - alMakeIndex(ts->addedPackages); alMakeIndex(ts->availablePackages); @@ -1720,13 +1717,6 @@ int rpmdepCheck(rpmTransactionSet ts, } pi = teFreeIterator(pi); -/*@-type@*/ /* FIX: return refcounted rpmProblemSet */ - if (ts->probs->numProblems) { - *dsprobs = ts->probs->probs; - ts->probs->probs = NULL; - *numProbs = ts->probs->numProblems; - } -/*@=type@*/ rc = 0; exit: @@ -1738,6 +1728,5 @@ exit: else if (_cacheDependsRC) xx = rpmdbCloseDBI(ts->rpmdb, RPMDBI_DEPENDS); /*@=branchstate@*/ - ts->probs = rpmProblemSetFree(ts->probs); return rc; } diff --git a/lib/problems.c b/lib/problems.c index 592baaf15..817dce49d 100644 --- a/lib/problems.c +++ b/lib/problems.c @@ -22,7 +22,7 @@ rpmProblemSet XrpmpsUnlink(rpmProblemSet ps, const char * msg, const char * fn, unsigned ln) { /*@-modfilesystem@*/ -if (_ps_debug) +if (_ps_debug > 0 && msg != NULL) fprintf(stderr, "--> ps %p -- %d %s at %s:%u\n", ps, ps->nrefs, msg, fn, ln); /*@=modfilesystem@*/ ps->nrefs--; @@ -34,7 +34,7 @@ rpmProblemSet XrpmpsLink(rpmProblemSet ps, const char * msg, { ps->nrefs++; /*@-modfilesystem@*/ -if (_ps_debug) +if (_ps_debug > 0 && msg != NULL) fprintf(stderr, "--> ps %p ++ %d %s at %s:%u\n", ps, ps->nrefs, msg, fn, ln); /*@=modfilesystem@*/ /*@-refcounttrans@*/ return ps; /*@=refcounttrans@*/ @@ -52,22 +52,6 @@ rpmProblemSet rpmProblemSetCreate(void) return rpmpsLink(ps, "create"); } -/* XXX FIXME: merge into problems */ -rpmProblem rpmdepFreeConflicts(rpmProblem probs, int numProblems) -{ - int i; - - if (probs != NULL) - for (i = 0; i < numProblems; i++) { - rpmProblem p = probs + i; - p->pkgNEVR = _free(p->pkgNEVR); - p->altNEVR = _free(p->altNEVR); - p->str1 = _free(p->str1); - } - probs = _free(probs); - return NULL; -} - rpmProblemSet rpmProblemSetFree(rpmProblemSet ps) { if (ps == NULL) return NULL; @@ -349,21 +333,22 @@ static int sameProblem(const rpmProblem ap, const rpmProblem bp) } /* XXX FIXME: merge into rpmProblemSetPrint */ -void printDepProblems(FILE * fp, rpmProblem probs, int numProblems) +void printDepProblems(FILE * fp, rpmProblemSet ps) { - const char * pkgNEVR, * altNEVR; - rpmProblem p; int i; - if (probs != NULL) - for (i = 0; i < numProblems; i++) { + if (ps && ps->probs != NULL) + for (i = 0; i < ps->numProblems; i++) { + const char * pkgNEVR; + const char * altNEVR; + rpmProblem p; int j; - p = probs + i; + p = ps->probs + i; /* Filter already displayed problems. */ for (j = 0; j < i; j++) { - if (!sameProblem(p, probs + j)) + if (!sameProblem(p, ps->probs + j)) /*@innerbreak@*/ break; } if (j < i) diff --git a/lib/rpminstall.c b/lib/rpminstall.c index 57179a244..8389f2c71 100644 --- a/lib/rpminstall.c +++ b/lib/rpminstall.c @@ -217,6 +217,7 @@ int rpmInstall(rpmTransactionSet ts, const char ** fileArgv) { struct rpmEIU * eiu = memset(alloca(sizeof(*eiu)), 0, sizeof(*eiu)); + rpmProblemSet ps; rpmprobFilterFlags probFilter; rpmRelocation * relocations; /*@only@*/ /*@null@*/ const char * fileURL = NULL; @@ -228,7 +229,6 @@ int rpmInstall(rpmTransactionSet ts, int i; if (fileArgv == NULL) goto exit; - /*@-branchstate@*/ (void) rpmtsSetFlags(ts, ia->transFlags); probFilter = ia->probFilter; @@ -525,24 +525,22 @@ restart: if (eiu->numFailed) goto exit; if (eiu->numRPMS && !(ia->installInterfaceFlags & INSTALL_NODEPS)) { - rpmProblem conflicts; - int numConflicts; /*@-nullstate@*/ /* FIX: ts->rootDir may be NULL? */ - if (rpmdepCheck(ts, &conflicts, &numConflicts)) { + if (rpmdepCheck(ts)) { eiu->numFailed = eiu->numPkgs; stopInstall = 1; } /*@=nullstate@*/ - /*@-branchstate@*/ - if (!stopInstall && conflicts) { + ps = rpmtsGetProblems(ts); + if (!stopInstall && ps) { rpmMessage(RPMMESS_ERROR, _("Failed dependencies:\n")); - printDepProblems(stderr, conflicts, numConflicts); - conflicts = rpmdepFreeConflicts(conflicts, numConflicts); + printDepProblems(stderr, ps); eiu->numFailed = eiu->numPkgs; stopInstall = 1; + /*@-branchstate@*/ if (ts->suggests != NULL && ts->nsuggests > 0) { rpmMessage(RPMMESS_NORMAL, _(" Suggested resolutions:\n")); for (i = 0; i < ts->nsuggests; i++) { @@ -558,8 +556,9 @@ restart: } ts->suggests = _free(ts->suggests); } + /*@=branchstate@*/ } - /*@=branchstate@*/ + ps = rpmProblemSetFree(ps); } if (eiu->numRPMS && !(ia->installInterfaceFlags & INSTALL_NOORDER)) { @@ -572,23 +571,23 @@ restart: } if (eiu->numRPMS && !stopInstall) { - rpmProblemSet probs = NULL; packagesTotal = eiu->numRPMS + eiu->numSRPMS; rpmMessage(RPMMESS_DEBUG, _("installing binary packages\n")); /*@-nullstate@*/ /* FIX: ts->rootDir may be NULL? */ - rc = rpmRunTransactions(ts, NULL, &probs, probFilter); + rc = rpmRunTransactions(ts, NULL, probFilter); /*@=nullstate@*/ + ps = rpmtsGetProblems(ts); if (rc < 0) { eiu->numFailed += eiu->numRPMS; - } else if (rc > 0) { + } else if (rc > 0 || ps) { eiu->numFailed += rc; - rpmProblemSetPrint(stderr, probs); + rpmProblemSetPrint(stderr, ps); } - probs = rpmProblemSetFree(probs); + ps = rpmProblemSetFree(ps); } if (eiu->numSRPMS && !stopInstall) { @@ -640,11 +639,9 @@ int rpmErase(rpmTransactionSet ts, int count; const char ** arg; int numFailed = 0; - rpmProblem conflicts; - int numConflicts; int stopUninstall = 0; int numPackages = 0; - rpmProblemSet probs; + rpmProblemSet ps; if (argv == NULL) return 0; @@ -695,26 +692,28 @@ int rpmErase(rpmTransactionSet ts, } if (!(ia->eraseInterfaceFlags & UNINSTALL_NODEPS)) { - if (rpmdepCheck(ts, &conflicts, &numConflicts)) { + + if (rpmdepCheck(ts)) { numFailed = numPackages; stopUninstall = 1; } - /*@-branchstate@*/ - if (!stopUninstall && conflicts) { + ps = rpmtsGetProblems(ts); + if (!stopUninstall && ps) { rpmMessage(RPMMESS_ERROR, _("removing these packages would break " "dependencies:\n")); - printDepProblems(stderr, conflicts, numConflicts); - conflicts = rpmdepFreeConflicts(conflicts, numConflicts); + printDepProblems(stderr, ps); numFailed += numPackages; stopUninstall = 1; } - /*@=branchstate@*/ + ps = rpmProblemSetFree(ps); } if (!stopUninstall) { (void) rpmtsSetFlags(ts, (rpmtsGetFlags(ts) | RPMTRANS_FLAG_REVERSE)); - numFailed += rpmRunTransactions(ts, NULL, &probs, 0); + numFailed += rpmRunTransactions(ts, NULL, 0); + ps = rpmtsGetProblems(ts); + ps = rpmProblemSetFree(ps); } return numFailed; @@ -943,9 +942,7 @@ int rpmRollback(rpmTransactionSet ts, #ifdef NOTYET rpmdb db = NULL; rpmTransactionSet ts = NULL; - rpmDependencyConflict conflicts = NULL; - int numConflicts = 0; - rpmProblemSet probs = NULL; + rpmProblemSet ps; int ifmask= (INSTALL_UPGRADE|INSTALL_FRESHEN|INSTALL_INSTALL|INSTALL_ERASE); unsigned thistid = 0xffffffff; unsigned prevtid; @@ -1073,28 +1070,26 @@ int rpmRollback(rpmTransactionSet ts, rpmMessage(RPMMESS_DEBUG, _("rollback %d packages to %s"), packagesTotal, ctime(&tid)); - conflicts = NULL; - numConflicts = 0; - rc = rpmdepCheck(ts, &conflicts, &numConflicts); - if (rc != 0) { - rpmMessage(RPMMESS_ERROR, _("failed dependencies:\n")); - printDepProblems(stderr, conflicts, numConflicts); - conflicts = rpmdepFreeConflicts(conflicts, numConflicts); + rc = rpmdepCheck(ts); + ps = rpmtsGetProblems(ts); + if (rc != 0 && ps) { + rpmMessage(RPMMESS_ERROR, _("Failed dependencies:\n")); + printDepProblems(stderr, ps); + ps = rpmProblemSetFree(ps); goto exit; } + ps = rpmProblemSetFree(ps); rc = rpmdepOrder(ts); if (rc != 0) goto exit; - probs = NULL; - rc = rpmRunTransactions(ts, NULL, &probs, + rc = rpmRunTransactions(ts, NULL, (ia->probFilter|RPMPROB_FILTER_OLDPACKAGE)); - if (rc > 0) { - rpmProblemSetPrint(stderr, probs); - if (probs != NULL) rpmProblemSetFree(probs); - probs = NULL; - } + ps = rpmtsGetProblems(ts); + if (rc > 0) + rpmProblemSetPrint(stderr, ps); + ps = rpmProblemSetFree(ps); if (rc) goto exit; diff --git a/lib/rpmlib.h b/lib/rpmlib.h index 987de956c..26f029c85 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -1017,10 +1017,9 @@ void printDepFlags(FILE *fp, const char *version, int flags) /** * Print a problem array. * @param fp output file - * @param probs dependency problems - * @param numProblems no. of dependency problems + * @param ps dependency problems */ -void printDepProblems(FILE * fp, rpmProblem probs, int numProblems) +void printDepProblems(FILE * fp, /*@null@*/ const rpmProblemSet ps) /*@globals fileSystem @*/ /*@modifies *fp, fileSystem @*/; @@ -1399,6 +1398,15 @@ int rpmtsAvailable(rpmTransactionSet ts, const rpmDepSet ds) /*@globals fileSystem @*/ /*@modifies ts, fileSystem @*/; +/** + * Return (and clear) current transaction set problems. + * @param ts transaction set + * @return current problem set (or NULL) + */ +/*@null@*/ +rpmProblemSet rpmtsGetProblems(rpmTransactionSet ts) + /*@modifies ts @*/; + /** \ingroup rpmtrans * Re-create an empty transaction set. * @param ts transaction set @@ -1498,16 +1506,11 @@ int rpmtransGetKeys(rpmTransactionSet ts, /** \ingroup rpmtrans * Check that all dependencies can be resolved. * @param ts transaction set - * @retval dsprobs dependency problems - * @retval numProbs no. of dependency problems * @return 0 on success */ -int rpmdepCheck(rpmTransactionSet ts, - /*@exposed@*/ /*@out@*/ rpmProblem * dsprobs, - /*@exposed@*/ /*@out@*/ int * numProbs) +int rpmdepCheck(rpmTransactionSet ts) /*@globals fileSystem, internalState @*/ - /*@modifies ts, *dsprobs, *numProbs, - fileSystem, internalState @*/; + /*@modifies ts, fileSystem, internalState @*/; /** \ingroup rpmtrans * Determine package order in a transaction set according to dependencies. @@ -1532,17 +1535,6 @@ int rpmdepOrder(rpmTransactionSet ts) /*@globals fileSystem, internalState@*/ /*@modifies ts, fileSystem, internalState @*/; -/** \ingroup rpmtrans - * Destroy reported problems. - * @param probs dependency problems - * @param numProblems no. of dependency problems - * @retrun NULL always - */ -/*@null@*/ -rpmProblem rpmdepFreeConflicts(/*@only@*/ /*@null@*/ rpmProblem probs, - int numProblems) - /*@modifies probs @*/; - /** \ingroup rpmtrans * Bit(s) to control rpmRunTransactions() operation. */ @@ -1696,22 +1688,17 @@ int rpmtsSetNotifyCallback(rpmTransactionSet ts, /** \ingroup rpmtrans * Process all packages in a transaction set. * - * @warning The value returned in *newProbs is now refcounted, and should - * be free'd using rpmProblemSetFree(). - * * @param ts transaction set * @param okProbs previously known problems (or NULL) - * @retval newProbs address to return unfiltered problems (or NULL) * @param ignoreSet bits to filter problem types * @return 0 on success, -1 on error, >0 with newProbs set */ int rpmRunTransactions(rpmTransactionSet ts, rpmProblemSet okProbs, - /*@out@*/ rpmProblemSet * newProbs, rpmprobFilterFlags ignoreSet) /*@globals rpmGlobalMacroContext, fileSystem, internalState@*/ - /*@modifies ts, *newProbs, rpmGlobalMacroContext, + /*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/; /*@}*/ diff --git a/lib/rpmts.c b/lib/rpmts.c index d84e7f70e..11b2ee9ee 100644 --- a/lib/rpmts.c +++ b/lib/rpmts.c @@ -18,6 +18,7 @@ #include "debug.h" +/*@access rpmProblemSet @*/ /*@access rpmTransactionSet @*/ /*@access fnpyKey @*/ @@ -177,6 +178,9 @@ int rpmtsSolve(rpmTransactionSet ts, rpmDepSet ds) mi = rpmdbInitIterator(ts->sdb, rpmtag, keyp, keylen); while ((h = rpmdbNextIterator(mi)) != NULL) { + if (rpmtag == RPMTAG_PROVIDENAME && !rangeMatchesDepFlags(h, ds)) + continue; + str = headerSprintf(h, qfmt, rpmTagTable, rpmHeaderFormats, &errstr); if (str == NULL) { rpmError(RPMERR_QFMT, _("incorrect format: %s\n"), errstr); @@ -225,6 +229,19 @@ int rpmtsAvailable(rpmTransactionSet ts, const rpmDepSet ds) /*@=nullstate@*/ } +rpmProblemSet rpmtsGetProblems(rpmTransactionSet ts) +{ + rpmProblemSet ps = NULL; + if (ts) { + if (ts->probs) { + if (ts->probs->numProblems > 0) + ps = rpmpsLink(ts->probs, NULL); + ts->probs = rpmpsUnlink(ts->probs, NULL); + } + } + return ps; +} + void rpmtransClean(rpmTransactionSet ts) { if (ts) { @@ -242,6 +259,8 @@ void rpmtransClean(rpmTransactionSet ts) ts->suggests = _free(ts->suggests); ts->nsuggests = 0; + ts->probs = rpmProblemSetFree(ts->probs); + if (ts->sig != NULL) ts->sig = headerFreeData(ts->sig, ts->sigtype); if (ts->dig != NULL) @@ -360,6 +379,8 @@ rpmTransactionSet rpmtransCreateSet(rpmdb db, const char * rootDir) ts->orderCount = 0; ts->order = NULL; + ts->probs = NULL; + ts->sig = NULL; ts->dig = NULL; diff --git a/lib/rpmts.h b/lib/rpmts.h index 74a6bb7e8..4dec24b7d 100644 --- a/lib/rpmts.h +++ b/lib/rpmts.h @@ -30,22 +30,22 @@ typedef enum tsStage_e { */ struct rpmTransactionSet_s { rpmtransFlags transFlags; /*!< Bit(s) to control operation. */ -/*@observer@*/ /*@null@*/ - rpmCallbackFunction notify; /*!< Callback function. */ - tsmStage goal; /*!< Transaction goal (i.e. mode) */ /*@null@*/ int (*solve) (rpmTransactionSet ts, const rpmDepSet key) - /*@modifies ts @*/; /*!< Search for NEVR key. */ + /*@modifies ts @*/; /*!< Search for NEVRA key. */ int nsuggests; /*!< No. of depCheck suggestions. */ /*@only@*/ /*@null@*/ const void ** suggests; /*!< Possible depCheck suggestions. */ /*@refcounted@*/ /*@null@*/ rpmdb sdb; /*!< Available universe database handle. */ +/*@observer@*/ /*@null@*/ + rpmCallbackFunction notify; /*!< Callback function. */ /*@observer@*/ /*@null@*/ rpmCallbackData notifyData; /*!< Callback private data. */ + /*@refcounted@*/ /*@null@*/ rpmProblemSet probs; /*!< Current problems in transaction. */ rpmprobFilterFlags ignoreSet; diff --git a/lib/transaction.c b/lib/transaction.c index 2b2639c5e..72e14af15 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -1030,7 +1030,7 @@ TFI_t teiGetFi(const teIterator tei) #define NOTIFY(_ts, _al) if ((_ts)->notify) (void) (_ts)->notify _al int rpmRunTransactions( rpmTransactionSet ts, - rpmProblemSet okProbs, rpmProblemSet * newProbs, + rpmProblemSet okProbs, rpmprobFilterFlags ignoreSet) { int i, j; @@ -1061,7 +1061,6 @@ int rpmRunTransactions( rpmTransactionSet ts, ts->probs = rpmProblemSetFree(ts->probs); ts->probs = rpmProblemSetCreate(); - *newProbs = rpmpsLink(ts->probs, "RunTransactions"); ts->ignoreSet = ignoreSet; ts->currDir = _free(ts->currDir); ts->currDir = currentDirectory(); diff --git a/lib/ts.c b/lib/ts.c index 1b7dedcc7..d7092a5f7 100644 --- a/lib/ts.c +++ b/lib/ts.c @@ -370,18 +370,16 @@ if (!_debug) { #ifdef NOTYET if (!_debug) { - { rpmProblem conflicts = NULL; - int numConflicts = 0; + { rpmProblemSet ps; - (void) rpmdepCheck(ts, &conflicts, &numConflicts); + xx = rpmdepCheck(ts); - /*@-branchstate@*/ - if (conflicts) { - rpmMessage(RPMMESS_ERROR, _("failed dependencies:\n")); - printDepProblems(stderr, conflicts, numConflicts); - conflicts = rpmdepFreeConflicts(conflicts, numConflicts); + ps = rpmtsGetProblems(ts); + if (ps) { + rpmMessage(RPMMESS_ERROR, _("Failed dependencies:\n")); + printDepProblems(stderr, ps); } - /*@=branchstate@*/ + ps = rpmProblemSetFree(ts); } (void) rpmdepOrder(ts); diff --git a/lib/verify.c b/lib/verify.c index 70afe2b20..babc64bfc 100644 --- a/lib/verify.c +++ b/lib/verify.c @@ -19,6 +19,7 @@ #include "misc.h" /* XXX for uidToUname() and gnameToGid() */ #include "debug.h" +/*@access rpmProblemSet @*/ /*@access rpmProblem @*/ /*@access rpmTransactionSet @*/ /*@access PSM_t @*/ /* XXX for %verifyscript through psmStage() */ @@ -396,41 +397,42 @@ static int verifyDependencies(/*@unused@*/ QVA_t qva, rpmTransactionSet ts, /*@globals fileSystem, internalState @*/ /*@modifies ts, h, fileSystem, internalState @*/ { - rpmProblem conflicts; - int numConflicts; + rpmProblemSet ps; int rc = 0; /* assume no problems */ + int xx; int i; rpmtransClean(ts); (void) rpmtransAddPackage(ts, h, NULL, 0, NULL); - (void) rpmdepCheck(ts, &conflicts, &numConflicts); + xx = rpmdepCheck(ts); + ps = rpmtsGetProblems(ts); /*@-branchstate@*/ - if (numConflicts) { + if (ps) { const char * pkgNEVR, * altNEVR; - rpmProblem c; + rpmProblem p; char * t, * te; int nb = 512; - for (i = 0; i < numConflicts; i++) { - c = conflicts + i; - altNEVR = (c->altNEVR ? c->altNEVR : "? ?altNEVR?"); + for (i = 0; i < ps->numProblems; i++) { + p = ps->probs + i; + altNEVR = (p->altNEVR ? p->altNEVR : "? ?altNEVR?"); nb += strlen(altNEVR+2) + sizeof(", ") - 1; } te = t = alloca(nb); *te = '\0'; - pkgNEVR = (conflicts->pkgNEVR ? conflicts->pkgNEVR : "?pkgNEVR?"); + pkgNEVR = (ps->probs->pkgNEVR ? ps->probs->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?"); + for (i = 0; i < ps->numProblems; i++) { + p = ps->probs + i; + altNEVR = (p->altNEVR ? p->altNEVR : "? ?altNEVR?"); if (i) te = stpcpy(te, ", "); /* XXX FIXME: should probably supply the "[R|C] " type prefix */ te = stpcpy(te, altNEVR+2); } - conflicts = rpmdepFreeConflicts(conflicts, numConflicts); + ps = rpmProblemSetFree(ps); if (te > t) { *te++ = '\n'; diff --git a/po/cs.po b/po/cs.po index fbdb7ce3f..ee2469a90 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: 2002-04-12 21:24-0400\n" +"POT-Creation-Date: 2002-04-13 14:47-0400\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -9,53 +9,54 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:39 -msgid "failed build dependencies:\n" +#: build.c:38 +#, fuzzy +msgid "Failed build dependencies:\n" msgstr "chybné závislosti pøi sestavování:\n" -#: build.c:71 +#: build.c:69 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "Nelze otevøít spec soubor %s: %s\n" -#: build.c:151 build.c:163 +#: build.c:149 build.c:161 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "Nelze otevøít rouru pro tar: %m\n" #. Give up -#: build.c:170 +#: build.c:168 #, c-format msgid "Failed to read spec file from %s\n" msgstr "Nelze èíst spec soubor z %s\n" -#: build.c:198 +#: build.c:196 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "Nelze pøejmenovat %s na %s: %m\n" -#: build.c:238 +#: build.c:236 #, c-format msgid "failed to stat %s: %m\n" msgstr "nemohu zjistit stav %s: %m\n" -#: build.c:243 +#: build.c:241 #, c-format msgid "File %s is not a regular file.\n" msgstr "Soubor %s není obyèejný soubor.\n" -#: build.c:252 +#: build.c:250 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "Nezdá se, ¾e by %s byl spec soubor.\n" #. parse up the build operators -#: build.c:307 +#: build.c:305 #, c-format msgid "Building target platforms: %s\n" msgstr "Sestavuji cílové platformy: %s\n" -#: build.c:322 +#: build.c:320 #, c-format msgid "Building for target %s\n" msgstr "Sestavuji pro cíl %s\n" @@ -2067,81 +2068,81 @@ msgid "generate signature" msgstr "generovat PGP/GPG podpis" #. @observer@ -#: lib/problems.c:226 +#: lib/problems.c:210 msgid "different" msgstr "" -#: lib/problems.c:234 +#: lib/problems.c:218 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "balíèek %s je pro jinou architekturu" -#: lib/problems.c:239 +#: lib/problems.c:223 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "balíèek %s je pro jiný operaèní systém" -#: lib/problems.c:244 +#: lib/problems.c:228 #, c-format msgid "package %s is already installed" msgstr "balíèek %s je ji¾ nainstalován" -#: lib/problems.c:249 +#: lib/problems.c:233 #, 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:254 +#: lib/problems.c:238 #, 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:259 +#: lib/problems.c:243 #, 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:264 +#: lib/problems.c:248 #, 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:269 +#: lib/problems.c:253 #, 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:279 +#: lib/problems.c:263 #, 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:284 +#: lib/problems.c:268 #, 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:288 +#: lib/problems.c:272 #, 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:292 +#: lib/problems.c:276 #, 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:297 +#: lib/problems.c:281 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "neznámá chyba %d vznikla pøi manipulaci s balíèkem %s" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "conflicts with" msgstr " koliduje s %s-%s-%s\n" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "is needed by" msgstr " je nutné pro %s-%s-%s\n" @@ -2224,7 +2225,7 @@ msgstr "nemohu otev msgid "%s failed: %s\n" msgstr "%s selhalo\n" -#: lib/query.c:125 lib/rpmts.c:182 +#: lib/query.c:125 lib/rpmts.c:186 #, c-format msgid "incorrect format: %s\n" msgstr "nesprávný formát: %s\n" @@ -2268,7 +2269,7 @@ msgid "can't query %s: %s\n" msgstr "nemohu provést dotaz %s: %s\n" #: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "otevøení %s selhalo: %s\n" @@ -2351,7 +2352,7 @@ msgstr "z msgid "record %u could not be read\n" msgstr "záznam %d nelze pøeèíst\n" -#: lib/query.c:963 lib/rpminstall.c:678 +#: lib/query.c:963 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "balíèek %s není nainstalován\n" @@ -2503,7 +2504,7 @@ msgstr "chyba p msgid "file %s requires a newer version of RPM\n" msgstr "soubor %s vy¾aduje novìj¹í verzi RPM\n" -#: lib/rpminstall.c:486 lib/rpminstall.c:744 +#: lib/rpminstall.c:486 lib/rpminstall.c:743 #, c-format msgid "%s cannot be installed\n" msgstr "%s nemù¾e být nainstalován\n" @@ -2513,52 +2514,48 @@ msgstr "%s nem 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:540 +#: lib/rpminstall.c:538 lib/rpminstall.c:1076 #, fuzzy msgid "Failed dependencies:\n" msgstr "nevyøe¹ené závislosti:\n" -#: lib/rpminstall.c:547 +#: lib/rpminstall.c:545 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:579 +#: lib/rpminstall.c:577 msgid "installing binary packages\n" msgstr "instaluji binární balíèky\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open file %s: %s\n" msgstr "nemohu otevøít soubor %s: %s\n" -#: lib/rpminstall.c:681 +#: lib/rpminstall.c:678 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" urèuje více balíèkù\n" -#: lib/rpminstall.c:705 +#: lib/rpminstall.c:703 msgid "removing these packages would break dependencies:\n" msgstr "odstranìní tìchto balíèkù by poru¹ilo závislosti:\n" -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:730 #, c-format msgid "cannot open %s: %s\n" msgstr "nemohu otevøít %s: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:736 #, c-format msgid "Installing %s\n" msgstr "Instaluji %s\n" -#: lib/rpminstall.c:1073 +#: lib/rpminstall.c:1070 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpminstall.c:1080 -msgid "failed dependencies:\n" -msgstr "nevyøe¹ené závislosti:\n" - #: lib/rpmlead.c:47 #, c-format msgid "read failed: %s (%d)\n" @@ -2659,7 +2656,7 @@ msgstr "Nemohu msgid "Unable to open %s for reading: %s.\n" msgstr "Nemohu otevøít %s pro ètení: %s.\n" -#: lib/rpmts.c:94 lib/rpmts.c:136 +#: lib/rpmts.c:95 lib/rpmts.c:137 #, c-format msgid "cannot open Packages database in %s\n" msgstr "nemohu otevøít databázi balíèkù v %s\n" @@ -2814,21 +2811,21 @@ msgstr "%s p msgid "excluding directory %s\n" msgstr "vynechávám adresáø %s\n" -#: lib/transaction.c:1081 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "získávám seznam pøipojených systémù souborù\n" -#: lib/verify.c:329 +#: lib/verify.c:330 #, c-format msgid "missing %s" msgstr "chybí %s" -#: lib/verify.c:424 +#: lib/verify.c:426 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Nevyøe¹ené závislosti pro %s-%s-%s: " -#: lib/verify.c:464 +#: lib/verify.c:466 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "%s-%s-%s: kontrola digestu v hlavièce selhala\n" @@ -3419,6 +3416,9 @@ msgstr "url port mus msgid "failed to create %s: %s\n" msgstr "nemohu vytvoøit %s: %s\n" +#~ msgid "failed dependencies:\n" +#~ msgstr "nevyøe¹ené závislosti:\n" + #, fuzzy #~ msgid "%9s: (%s, %s) added to Depends cache.\n" #~ msgstr "%s: (%s, %s) pøidáno do ke¹e závislostí.\n" diff --git a/po/da.po b/po/da.po index 2b2347819..4e16addac 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: 2002-04-12 21:24-0400\n" +"POT-Creation-Date: 2002-04-13 14:47-0400\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -10,53 +10,54 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 0.9alpha\n" -#: build.c:39 -msgid "failed build dependencies:\n" +#: build.c:38 +#, fuzzy +msgid "Failed build dependencies:\n" msgstr "afhængighedskrav for pakkeopbygning kunne ikke imødekommes:\n" -#: build.c:71 +#: build.c:69 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "Kan ikke åbne spec-fil %s: %s\n" -#: build.c:151 build.c:163 +#: build.c:149 build.c:161 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "Kunne ikke åbne tar-videreførsel: %m\n" #. Give up -#: build.c:170 +#: build.c:168 #, c-format msgid "Failed to read spec file from %s\n" msgstr "Kunne ikke læse spec-fil fra %s\n" -#: build.c:198 +#: build.c:196 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "Kunne ikke omdøbe %s til %s: %m\n" -#: build.c:238 +#: build.c:236 #, c-format msgid "failed to stat %s: %m\n" msgstr "kunne ikke finde %s: %m\n" -#: build.c:243 +#: build.c:241 #, c-format msgid "File %s is not a regular file.\n" msgstr "Filen %s er ikke en regulær fil.\n" -#: build.c:252 +#: build.c:250 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "Filen %s synes ikke at være en spec-fil.\n" #. parse up the build operators -#: build.c:307 +#: build.c:305 #, c-format msgid "Building target platforms: %s\n" msgstr "Opbygger mål-platforme: %s\n" -#: build.c:322 +#: build.c:320 #, c-format msgid "Building for target %s\n" msgstr "Opbygger for mål %s\n" @@ -2081,82 +2082,82 @@ msgid "generate signature" msgstr "generér PGP/GPG-signatur" #. @observer@ -#: lib/problems.c:226 +#: lib/problems.c:210 msgid "different" msgstr "" -#: lib/problems.c:234 +#: lib/problems.c:218 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "pakken %s hører til en anden arkitektur" -#: lib/problems.c:239 +#: lib/problems.c:223 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "pakken %s hører til et andet operativsystem" -#: lib/problems.c:244 +#: lib/problems.c:228 #, c-format msgid "package %s is already installed" msgstr "pakken %s er allerede installeret" -#: lib/problems.c:249 +#: lib/problems.c:233 #, c-format msgid "path %s in package %s is not relocateable" msgstr "sti %s i pakke %s kan ikke omrokeres" -#: lib/problems.c:254 +#: lib/problems.c:238 #, 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:259 +#: lib/problems.c:243 #, 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:264 +#: lib/problems.c:248 #, 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:269 +#: lib/problems.c:253 #, 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:279 +#: lib/problems.c:263 #, 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:284 +#: lib/problems.c:268 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "pakke %s prætransaktion-systemkald: %s mislykkedes: %s" -#: lib/problems.c:288 +#: lib/problems.c:272 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" -#: lib/problems.c:292 +#: lib/problems.c:276 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" -#: lib/problems.c:297 +#: lib/problems.c:281 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ukendt fejl %d under arbejdet med pakken %s" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "conflicts with" msgstr " skaber konflikt med %s-%s-%s\n" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "is needed by" msgstr " kræves af %s-%s-%s\n" @@ -2241,7 +2242,7 @@ msgstr "kunne ikke msgid "%s failed: %s\n" msgstr "%s mislykkedes\n" -#: lib/query.c:125 lib/rpmts.c:182 +#: lib/query.c:125 lib/rpmts.c:186 #, c-format msgid "incorrect format: %s\n" msgstr "ugyldigt format: %s\n" @@ -2285,7 +2286,7 @@ msgid "can't query %s: %s\n" msgstr "kunne ikke forespørge %s: %s\n" #: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "åbning af %s mislykkedes %s\n" @@ -2368,7 +2369,7 @@ msgstr "pakkens post-nummer: %u\n" msgid "record %u could not be read\n" msgstr "post %d kunne ikke læses\n" -#: lib/query.c:963 lib/rpminstall.c:678 +#: lib/query.c:963 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "pakken %s er ikke installeret\n" @@ -2521,7 +2522,7 @@ msgstr "fejl ved l msgid "file %s requires a newer version of RPM\n" msgstr "filen %s kræver en nyere version af RPM\n" -#: lib/rpminstall.c:486 lib/rpminstall.c:744 +#: lib/rpminstall.c:486 lib/rpminstall.c:743 #, c-format msgid "%s cannot be installed\n" msgstr "%s kunne ikke installeres\n" @@ -2531,52 +2532,48 @@ msgstr "%s kunne ikke installeres\n" msgid "found %d source and %d binary packages\n" msgstr "fandt %d kilde- og %d binærpakker\n" -#: lib/rpminstall.c:540 +#: lib/rpminstall.c:538 lib/rpminstall.c:1076 #, fuzzy msgid "Failed dependencies:\n" msgstr "afhængighedskrav, der ikke kunne imødekommes:\n" -#: lib/rpminstall.c:547 +#: lib/rpminstall.c:545 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:579 +#: lib/rpminstall.c:577 msgid "installing binary packages\n" msgstr "installerer binærpakker\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open file %s: %s\n" msgstr "kunne ikke åbne fil %s: %s\n" -#: lib/rpminstall.c:681 +#: lib/rpminstall.c:678 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" angiver flere pakker\n" -#: lib/rpminstall.c:705 +#: lib/rpminstall.c:703 msgid "removing these packages would break dependencies:\n" msgstr "fjernelse af disse pakker ville bryde afhængighederne:\n" -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:730 #, c-format msgid "cannot open %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:736 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" -#: lib/rpminstall.c:1073 +#: lib/rpminstall.c:1070 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpminstall.c:1080 -msgid "failed dependencies:\n" -msgstr "afhængighedskrav, der ikke kunne imødekommes:\n" - #: lib/rpmlead.c:47 #, c-format msgid "read failed: %s (%d)\n" @@ -2679,7 +2676,7 @@ msgstr "Kunne ikke l msgid "Unable to open %s for reading: %s.\n" msgstr "Kunne ikke åbne %s for læsning: %s.\n" -#: lib/rpmts.c:94 lib/rpmts.c:136 +#: lib/rpmts.c:95 lib/rpmts.c:137 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kunne ikke åbne Packages-database i %s\n" @@ -2833,21 +2830,21 @@ msgstr "%s oversprunget grundet manglende ok-flag\n" msgid "excluding directory %s\n" msgstr "ekskluderer kataloget %s\n" -#: lib/transaction.c:1081 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "henter liste over monterede filsystemer\n" -#: lib/verify.c:329 +#: lib/verify.c:330 #, c-format msgid "missing %s" msgstr "manglende %s" -#: lib/verify.c:424 +#: lib/verify.c:426 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Ikke-tilfredsstillede afhængighedskrav for %s-%s-%s: " -#: lib/verify.c:464 +#: lib/verify.c:466 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3444,6 +3441,9 @@ msgstr "url-port skal v msgid "failed to create %s: %s\n" msgstr "kunne ikke oprette %s: %s\n" +#~ msgid "failed dependencies:\n" +#~ msgstr "afhængighedskrav, der ikke kunne imødekommes:\n" + #, fuzzy #~ msgid "%9s: (%s, %s) added to Depends cache.\n" #~ msgstr "%s: (%s, %s) tilføjet til afhængigheds-buffer.\n" diff --git a/po/de.po b/po/de.po index 226ad8744..24a4a8618 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: 2002-04-12 21:24-0400\n" +"POT-Creation-Date: 2002-04-13 14:47-0400\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -45,59 +45,59 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:39 +#: build.c:38 #, fuzzy -msgid "failed build dependencies:\n" +msgid "Failed build dependencies:\n" msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n" # , c-format -#: build.c:71 +#: build.c:69 #, fuzzy, c-format msgid "Unable to open spec file %s: %s\n" msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s." # , c-format -#: build.c:151 build.c:163 +#: build.c:149 build.c:161 #, fuzzy, c-format msgid "Failed to open tar pipe: %m\n" msgstr "Öffnen von %s fehlgeschlagen\n" # , c-format #. Give up -#: build.c:170 +#: build.c:168 #, fuzzy, c-format msgid "Failed to read spec file from %s\n" msgstr "Lesen von %s fehlgeschlagen: %s." # , c-format -#: build.c:198 +#: build.c:196 #, fuzzy, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "Lesen von %s fehlgeschlagen: %s." # , c-format -#: build.c:238 +#: build.c:236 #, fuzzy, c-format msgid "failed to stat %s: %m\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build.c:243 +#: build.c:241 #, fuzzy, c-format msgid "File %s is not a regular file.\n" msgstr "%s scheint kein RPM-Paket zu sein\n" -#: build.c:252 +#: build.c:250 #, fuzzy, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "%s scheint kein RPM-Paket zu sein\n" #. parse up the build operators -#: build.c:307 +#: build.c:305 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:322 +#: build.c:320 #, fuzzy, c-format msgid "Building for target %s\n" msgstr "Fehler beim Suchen nach Paket %s\n" @@ -2246,85 +2246,85 @@ msgid "generate signature" msgstr "PGP-Signatur generieren" #. @observer@ -#: lib/problems.c:226 +#: lib/problems.c:210 msgid "different" msgstr "" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/problems.c:234 +#: lib/problems.c:218 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/problems.c:239 +#: lib/problems.c:223 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/problems.c:244 +#: lib/problems.c:228 #, fuzzy, c-format msgid "package %s is already installed" msgstr "Paket %s ist nicht installiert\n" -#: lib/problems.c:249 +#: lib/problems.c:233 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "Paket %s ist nicht installiert\n" -#: lib/problems.c:254 +#: lib/problems.c:238 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:243 #, 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:264 +#: lib/problems.c:248 #, 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:269 +#: lib/problems.c:253 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:263 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/problems.c:284 +#: lib/problems.c:268 #, 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:288 +#: lib/problems.c:272 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" -#: lib/problems.c:292 +#: lib/problems.c:276 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" -#: lib/problems.c:297 +#: lib/problems.c:281 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "conflicts with" msgstr " steht im Konflikt mit %s-%s-%s\n" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "is needed by" msgstr " wird von %s-%s-%s gebraucht\n" @@ -2410,7 +2410,7 @@ msgstr " msgid "%s failed: %s\n" msgstr "pgp fehlgeschlagen" -#: lib/query.c:125 lib/rpmts.c:182 +#: lib/query.c:125 lib/rpmts.c:186 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "Fehler beim Format %s\n" @@ -2456,7 +2456,7 @@ msgid "can't query %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" #: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:887 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" @@ -2543,7 +2543,7 @@ msgstr "ung msgid "record %u could not be read\n" msgstr "Eintrag %d konnte nicht gelesen werden\n" -#: lib/query.c:963 lib/rpminstall.c:678 +#: lib/query.c:963 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "Paket %s ist nicht installiert\n" @@ -2698,7 +2698,7 @@ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:486 lib/rpminstall.c:744 +#: lib/rpminstall.c:486 lib/rpminstall.c:743 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "Fehler: %s kann nicht installiert werden\n" @@ -2708,54 +2708,50 @@ msgstr "Fehler: %s kann nicht installiert werden\n" msgid "found %d source and %d binary packages\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/rpminstall.c:540 +#: lib/rpminstall.c:538 lib/rpminstall.c:1076 #, fuzzy msgid "Failed dependencies:\n" msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n" -#: lib/rpminstall.c:547 +#: lib/rpminstall.c:545 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:579 +#: lib/rpminstall.c:577 #, fuzzy msgid "installing binary packages\n" msgstr "Paket installieren" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:599 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/rpminstall.c:681 +#: lib/rpminstall.c:678 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" bezeichnet mehrere Pakete\n" # oder besser: "... verletzen" ? -#: lib/rpminstall.c:705 +#: lib/rpminstall.c:703 msgid "removing these packages would break dependencies:\n" msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n" -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:730 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:736 #, c-format msgid "Installing %s\n" msgstr "Installiere %s\n" -#: lib/rpminstall.c:1073 +#: lib/rpminstall.c:1070 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "Es wurden keine Pakete für die Deinstallation angegeben" -#: lib/rpminstall.c:1080 -msgid "failed dependencies:\n" -msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n" - #: lib/rpmlead.c:47 #, fuzzy, c-format msgid "read failed: %s (%d)\n" @@ -2859,7 +2855,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s." -#: lib/rpmts.c:94 lib/rpmts.c:136 +#: lib/rpmts.c:95 lib/rpmts.c:137 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" @@ -3020,21 +3016,21 @@ msgstr "" msgid "excluding directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/transaction.c:1081 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:329 +#: lib/verify.c:330 #, fuzzy, c-format msgid "missing %s" msgstr "fehlende { nach %{" -#: lib/verify.c:424 +#: lib/verify.c:426 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: " -#: lib/verify.c:464 +#: lib/verify.c:466 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3644,6 +3640,9 @@ msgstr "Fehler: der FTP-Port muss eine Zahl sein\n" msgid "failed to create %s: %s\n" msgstr "anlegen von %s fehlgeschlagen\n" +#~ msgid "failed dependencies:\n" +#~ msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n" + #, fuzzy #~ msgid "%9s: (%s, %s) added to Depends cache.\n" #~ msgstr "die Datei »%s« gehört zu keinem Paket\n" diff --git a/po/fi.po b/po/fi.po index 2d3410a30..a2ea4df15 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,60 +1,60 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-12 21:24-0400\n" +"POT-Creation-Date: 2002-04-13 14:47-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" -#: build.c:39 +#: build.c:38 #, fuzzy -msgid "failed build dependencies:\n" +msgid "Failed build dependencies:\n" msgstr "puuttuvat riippuvuudet:\n" -#: build.c:71 +#: build.c:69 #, fuzzy, c-format msgid "Unable to open spec file %s: %s\n" msgstr "En voi avata %s luettavaksi: %s." -#: build.c:151 build.c:163 +#: build.c:149 build.c:161 #, fuzzy, c-format msgid "Failed to open tar pipe: %m\n" msgstr "%s:n avaus epäonnistui\n" #. Give up -#: build.c:170 +#: build.c:168 #, fuzzy, c-format msgid "Failed to read spec file from %s\n" msgstr "En voi lukea %s: %s." -#: build.c:198 +#: build.c:196 #, fuzzy, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "En voi lukea %s: %s." -#: build.c:238 +#: build.c:236 #, fuzzy, c-format msgid "failed to stat %s: %m\n" msgstr "en voinut avata %s: %s" -#: build.c:243 +#: build.c:241 #, fuzzy, c-format msgid "File %s is not a regular file.\n" msgstr "%s ei vaikuta RPM-paketilta\n" -#: build.c:252 +#: build.c:250 #, fuzzy, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "%s ei vaikuta RPM-paketilta\n" #. parse up the build operators -#: build.c:307 +#: build.c:305 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:322 +#: build.c:320 #, fuzzy, c-format msgid "Building for target %s\n" msgstr "virhe etsittäessä pakettia %s\n" @@ -2129,81 +2129,81 @@ msgid "generate signature" msgstr "generoi PGP-allekirjoitus" #. @observer@ -#: lib/problems.c:226 +#: lib/problems.c:210 msgid "different" msgstr "" -#: lib/problems.c:234 +#: lib/problems.c:218 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/problems.c:239 +#: lib/problems.c:223 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/problems.c:244 +#: lib/problems.c:228 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paketti %s ei ole asennettu\n" -#: lib/problems.c:249 +#: lib/problems.c:233 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paketti %s ei ole asennettu\n" -#: lib/problems.c:254 +#: lib/problems.c:238 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:243 #, 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:264 +#: lib/problems.c:248 #, 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:269 +#: lib/problems.c:253 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:263 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:284 +#: lib/problems.c:268 #, 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:288 +#: lib/problems.c:272 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: lib/problems.c:292 +#: lib/problems.c:276 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: lib/problems.c:297 +#: lib/problems.c:281 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "conflicts with" msgstr " on ristiriidassa %s-%s-%s:n kanssa\n" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "is needed by" msgstr "vaatii %s-%s-%s\n" @@ -2287,7 +2287,7 @@ msgstr "en voinut avata %s: %s" msgid "%s failed: %s\n" msgstr "pgp epäonnistui" -#: lib/query.c:125 lib/rpmts.c:182 +#: lib/query.c:125 lib/rpmts.c:186 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "virhe formaatissa: %s\n" @@ -2333,7 +2333,7 @@ msgid "can't query %s: %s\n" msgstr "virhe: en voi avata %s\n" #: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:887 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" @@ -2417,7 +2417,7 @@ msgstr "virheellinen paketin numero: %s\n" msgid "record %u could not be read\n" msgstr "tietuetta %d ei voitu lukea\n" -#: lib/query.c:963 lib/rpminstall.c:678 +#: lib/query.c:963 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "paketti %s ei ole asennettu\n" @@ -2570,7 +2570,7 @@ msgstr "virhe luotaessa hakemistoa %s: %s" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:486 lib/rpminstall.c:744 +#: lib/rpminstall.c:486 lib/rpminstall.c:743 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "virhe: %s ei voida asentaa\n" @@ -2580,53 +2580,49 @@ msgstr "virhe: %s ei voida asentaa\n" msgid "found %d source and %d binary packages\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/rpminstall.c:540 +#: lib/rpminstall.c:538 lib/rpminstall.c:1076 #, fuzzy msgid "Failed dependencies:\n" msgstr "puuttuvat riippuvuudet:\n" -#: lib/rpminstall.c:547 +#: lib/rpminstall.c:545 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:579 +#: lib/rpminstall.c:577 #, fuzzy msgid "installing binary packages\n" msgstr "asenna paketti" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:599 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/rpminstall.c:681 +#: lib/rpminstall.c:678 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" määrittää useita paketteja\n" -#: lib/rpminstall.c:705 +#: lib/rpminstall.c:703 msgid "removing these packages would break dependencies:\n" msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n" -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:730 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "virhe: en voi avata %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:736 #, c-format msgid "Installing %s\n" msgstr "Asennan: %s\n" -#: lib/rpminstall.c:1073 +#: lib/rpminstall.c:1070 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "poistolle ei määritelty paketteja" -#: lib/rpminstall.c:1080 -msgid "failed dependencies:\n" -msgstr "puuttuvat riippuvuudet:\n" - #: lib/rpmlead.c:47 #, fuzzy, c-format msgid "read failed: %s (%d)\n" @@ -2727,7 +2723,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "En voi avata %s luettavaksi: %s." -#: lib/rpmts.c:94 lib/rpmts.c:136 +#: lib/rpmts.c:95 lib/rpmts.c:137 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "virhe: en voi avata %s%s/packages.rpm\n" @@ -2888,21 +2884,21 @@ msgstr "" msgid "excluding directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/transaction.c:1081 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:329 +#: lib/verify.c:330 #, fuzzy, c-format msgid "missing %s" msgstr "puuttuva '{' '%':n jälkeen" -#: lib/verify.c:424 +#: lib/verify.c:426 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:" -#: lib/verify.c:464 +#: lib/verify.c:466 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3502,6 +3498,9 @@ msgstr "virhe: ftpport pit msgid "failed to create %s: %s\n" msgstr "%s:n luonti epäonnistui\n" +#~ msgid "failed dependencies:\n" +#~ msgstr "puuttuvat riippuvuudet:\n" + #, fuzzy #~ msgid "%9s: (%s, %s) added to Depends cache.\n" #~ msgstr "tiedostoa %s ei omista mikään paketti\n" diff --git a/po/fr.po b/po/fr.po index e28115daa..b3b19bc3b 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: 2002-04-12 21:24-0400\n" +"POT-Creation-Date: 2002-04-13 14:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,54 +14,54 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:39 +#: build.c:38 #, fuzzy -msgid "failed build dependencies:\n" +msgid "Failed build dependencies:\n" msgstr "impossible d'ouvrir: %s\n" -#: build.c:71 +#: build.c:69 #, fuzzy, c-format msgid "Unable to open spec file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build.c:151 build.c:163 +#: build.c:149 build.c:161 #, fuzzy, c-format msgid "Failed to open tar pipe: %m\n" msgstr "impossible d'ouvrir: %s\n" #. Give up -#: build.c:170 +#: build.c:168 #, fuzzy, c-format msgid "Failed to read spec file from %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build.c:198 +#: build.c:196 #, fuzzy, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "impossible d'ouvrir: %s\n" -#: build.c:238 +#: build.c:236 #, fuzzy, c-format msgid "failed to stat %s: %m\n" msgstr "impossible d'ouvrir: %s\n" -#: build.c:243 +#: build.c:241 #, fuzzy, c-format msgid "File %s is not a regular file.\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: build.c:252 +#: build.c:250 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "" #. parse up the build operators -#: build.c:307 +#: build.c:305 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:322 +#: build.c:320 #, fuzzy, c-format msgid "Building for target %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -2167,80 +2167,80 @@ msgid "generate signature" msgstr " --sign - genre une signature PGP" #. @observer@ -#: lib/problems.c:226 +#: lib/problems.c:210 msgid "different" msgstr "" -#: lib/problems.c:234 +#: lib/problems.c:218 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:239 +#: lib/problems.c:223 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:244 +#: lib/problems.c:228 #, fuzzy, c-format msgid "package %s is already installed" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:249 +#: lib/problems.c:233 #, 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:254 +#: lib/problems.c:238 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:243 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:264 +#: lib/problems.c:248 #, 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:269 +#: lib/problems.c:253 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:263 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:284 +#: lib/problems.c:268 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:272 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:292 +#: lib/problems.c:276 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/problems.c:297 +#: lib/problems.c:281 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/problems.c:377 +#: lib/problems.c:362 msgid "conflicts with" msgstr "" -#: lib/problems.c:377 +#: lib/problems.c:362 msgid "is needed by" msgstr "" @@ -2324,7 +2324,7 @@ msgstr "impossible d'ouvrir: %s\n" msgid "%s failed: %s\n" msgstr "La construction a chou.\n" -#: lib/query.c:125 lib/rpmts.c:182 +#: lib/query.c:125 lib/rpmts.c:186 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -2370,7 +2370,7 @@ msgid "can't query %s: %s\n" msgstr "impossible d'ouvrir: %s\n" #: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:887 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "La construction a chou.\n" @@ -2454,7 +2454,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:963 lib/rpminstall.c:678 +#: lib/query.c:963 lib/rpminstall.c:675 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -2605,7 +2605,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:486 lib/rpminstall.c:744 +#: lib/rpminstall.c:486 lib/rpminstall.c:743 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -2615,52 +2615,48 @@ msgstr "aucun package n'a t spcifi pour l'installation" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:540 +#: lib/rpminstall.c:538 lib/rpminstall.c:1076 #, fuzzy msgid "Failed dependencies:\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:547 +#: lib/rpminstall.c:545 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:579 +#: lib/rpminstall.c:577 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:599 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:681 +#: lib/rpminstall.c:678 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:705 +#: lib/rpminstall.c:703 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:730 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:736 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1073 +#: lib/rpminstall.c:1070 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: lib/rpminstall.c:1080 -msgid "failed dependencies:\n" -msgstr "" - #: lib/rpmlead.c:47 #, fuzzy, c-format msgid "read failed: %s (%d)\n" @@ -2761,7 +2757,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmts.c:94 lib/rpmts.c:136 +#: lib/rpmts.c:95 lib/rpmts.c:137 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -2919,21 +2915,21 @@ msgstr "" msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1081 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:329 +#: lib/verify.c:330 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:424 +#: lib/verify.c:426 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "impossible d'ouvrir: %s\n" -#: lib/verify.c:464 +#: lib/verify.c:466 #, 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 5905e0b73..32ccc0052 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: 2002-04-12 21:24-0400\n" +"POT-Creation-Date: 2002-04-13 14:47-0400\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -9,53 +9,53 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: build.c:39 -msgid "failed build dependencies:\n" +#: build.c:38 +msgid "Failed build dependencies:\n" msgstr "" -#: build.c:71 +#: build.c:69 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "" -#: build.c:151 build.c:163 +#: build.c:149 build.c:161 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "" #. Give up -#: build.c:170 +#: build.c:168 #, c-format msgid "Failed to read spec file from %s\n" msgstr "" -#: build.c:198 +#: build.c:196 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "" -#: build.c:238 +#: build.c:236 #, c-format msgid "failed to stat %s: %m\n" msgstr "" -#: build.c:243 +#: build.c:241 #, c-format msgid "File %s is not a regular file.\n" msgstr "" -#: build.c:252 +#: build.c:250 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "" #. parse up the build operators -#: build.c:307 +#: build.c:305 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:322 +#: build.c:320 #, c-format msgid "Building for target %s\n" msgstr "" @@ -2008,80 +2008,80 @@ msgid "generate signature" msgstr "" #. @observer@ -#: lib/problems.c:226 +#: lib/problems.c:210 msgid "different" msgstr "" -#: lib/problems.c:234 +#: lib/problems.c:218 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/problems.c:239 +#: lib/problems.c:223 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:244 +#: lib/problems.c:228 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:249 +#: lib/problems.c:233 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:254 +#: lib/problems.c:238 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:243 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:264 +#: lib/problems.c:248 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:253 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:263 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:284 +#: lib/problems.c:268 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:272 #, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "" -#: lib/problems.c:292 +#: lib/problems.c:276 #, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "" -#: lib/problems.c:297 +#: lib/problems.c:281 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/problems.c:377 +#: lib/problems.c:362 msgid "conflicts with" msgstr "" -#: lib/problems.c:377 +#: lib/problems.c:362 msgid "is needed by" msgstr "" @@ -2163,7 +2163,7 @@ msgstr "" msgid "%s failed: %s\n" msgstr "" -#: lib/query.c:125 lib/rpmts.c:182 +#: lib/query.c:125 lib/rpmts.c:186 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -2207,7 +2207,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2290,7 +2290,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:963 lib/rpminstall.c:678 +#: lib/query.c:963 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2438,7 +2438,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:486 lib/rpminstall.c:744 +#: lib/rpminstall.c:486 lib/rpminstall.c:743 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2448,51 +2448,47 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:540 +#: lib/rpminstall.c:538 lib/rpminstall.c:1076 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:547 +#: lib/rpminstall.c:545 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:579 +#: lib/rpminstall.c:577 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:681 +#: lib/rpminstall.c:678 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:705 +#: lib/rpminstall.c:703 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:730 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:736 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1073 +#: lib/rpminstall.c:1070 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpminstall.c:1080 -msgid "failed dependencies:\n" -msgstr "" - #: lib/rpmlead.c:47 #, c-format msgid "read failed: %s (%d)\n" @@ -2593,7 +2589,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "" -#: lib/rpmts.c:94 lib/rpmts.c:136 +#: lib/rpmts.c:95 lib/rpmts.c:137 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" @@ -2744,21 +2740,21 @@ msgstr "" msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1081 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:329 +#: lib/verify.c:330 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:424 +#: lib/verify.c:426 #, c-format msgid "Unsatisifed dependencies for %s: " msgstr "" -#: lib/verify.c:464 +#: lib/verify.c:466 #, 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 15795cf02..8a2d62bd4 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: 2002-04-12 21:24-0400\n" +"POT-Creation-Date: 2002-04-13 14:47-0400\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -9,53 +9,54 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:39 -msgid "failed build dependencies:\n" +#: build.c:38 +#, fuzzy +msgid "Failed build dependencies:\n" msgstr "gat ekki útbúið pakkaskilyrði:\n" -#: build.c:71 +#: build.c:69 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "Get ekki opnað spec skrána %s: %s\n" -#: build.c:151 build.c:163 +#: build.c:149 build.c:161 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "Gat ekki opnað pípu í tar: %m\n" #. Give up -#: build.c:170 +#: build.c:168 #, c-format msgid "Failed to read spec file from %s\n" msgstr "Gat ekki lesið spec skrá frá %s\n" -#: build.c:198 +#: build.c:196 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "Gat ekki endurnefnt %s sem %s: %m\n" -#: build.c:238 +#: build.c:236 #, c-format msgid "failed to stat %s: %m\n" msgstr "gat ekki skoðað %s: %m\n" -#: build.c:243 +#: build.c:241 #, c-format msgid "File %s is not a regular file.\n" msgstr "Skráin %s er ekki venjuleg skrá.\n" -#: build.c:252 +#: build.c:250 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "Skráin %s virðist ekki vera specskrá.\n" #. parse up the build operators -#: build.c:307 +#: build.c:305 #, c-format msgid "Building target platforms: %s\n" msgstr "Þýði fyrir markkerfi: %s\n" -#: build.c:322 +#: build.c:320 #, c-format msgid "Building for target %s\n" msgstr "Þýði fyrir markkerfi %s\n" @@ -2024,80 +2025,80 @@ msgid "generate signature" msgstr "búa til undirskrift" #. @observer@ -#: lib/problems.c:226 +#: lib/problems.c:210 msgid "different" msgstr "" -#: lib/problems.c:234 +#: lib/problems.c:218 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/problems.c:239 +#: lib/problems.c:223 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:244 +#: lib/problems.c:228 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:249 +#: lib/problems.c:233 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:254 +#: lib/problems.c:238 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:243 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:264 +#: lib/problems.c:248 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:253 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:263 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:284 +#: lib/problems.c:268 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:272 #, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "" -#: lib/problems.c:292 +#: lib/problems.c:276 #, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "" -#: lib/problems.c:297 +#: lib/problems.c:281 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/problems.c:377 +#: lib/problems.c:362 msgid "conflicts with" msgstr "" -#: lib/problems.c:377 +#: lib/problems.c:362 msgid "is needed by" msgstr "" @@ -2179,7 +2180,7 @@ msgstr "gat ekki opna msgid "%s failed: %s\n" msgstr "%s brást\n" -#: lib/query.c:125 lib/rpmts.c:182 +#: lib/query.c:125 lib/rpmts.c:186 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -2223,7 +2224,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2306,7 +2307,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:963 lib/rpminstall.c:678 +#: lib/query.c:963 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2454,7 +2455,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:486 lib/rpminstall.c:744 +#: lib/rpminstall.c:486 lib/rpminstall.c:743 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2464,52 +2465,48 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:540 +#: lib/rpminstall.c:538 lib/rpminstall.c:1076 #, fuzzy msgid "Failed dependencies:\n" msgstr "gat ekki útbúið pakkaskilyrði:\n" -#: lib/rpminstall.c:547 +#: lib/rpminstall.c:545 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:579 +#: lib/rpminstall.c:577 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:681 +#: lib/rpminstall.c:678 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:705 +#: lib/rpminstall.c:703 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:730 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:736 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1073 +#: lib/rpminstall.c:1070 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpminstall.c:1080 -msgid "failed dependencies:\n" -msgstr "" - #: lib/rpmlead.c:47 #, c-format msgid "read failed: %s (%d)\n" @@ -2610,7 +2607,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Get ekki opnað %s til lesturs: %s.\n" -#: lib/rpmts.c:94 lib/rpmts.c:136 +#: lib/rpmts.c:95 lib/rpmts.c:137 #, c-format msgid "cannot open Packages database in %s\n" msgstr "get ekki opnað pakka gagnagrunn í\n" @@ -2761,21 +2758,21 @@ msgstr "" msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1081 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:329 +#: lib/verify.c:330 #, c-format msgid "missing %s" msgstr "vantar %s" -#: lib/verify.c:424 +#: lib/verify.c:426 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Óuppfyllt pakkaskilyrði fyrir %s-%s-%s: " -#: lib/verify.c:464 +#: lib/verify.c:466 #, 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 20185bf2b..2fe197e68 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: 2002-04-12 21:24-0400\n" +"POT-Creation-Date: 2002-04-13 14:47-0400\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -14,54 +14,54 @@ msgstr "" "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: EUC-JP\n" -#: build.c:39 +#: build.c:38 #, fuzzy -msgid "failed build dependencies:\n" +msgid "Failed build dependencies:\n" msgstr "°Í¸À­¤Î·çÇ¡:\n" -#: build.c:71 +#: build.c:69 #, fuzzy, c-format msgid "Unable to open spec file %s: %s\n" msgstr "spec ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s\n" -#: build.c:151 build.c:163 +#: build.c:149 build.c:161 #, fuzzy, c-format msgid "Failed to open tar pipe: %m\n" msgstr "tar ¥Ñ¥¤¥×¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n" #. Give up -#: build.c:170 +#: build.c:168 #, fuzzy, c-format msgid "Failed to read spec file from %s\n" msgstr "%s ¤«¤é spec ¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: build.c:198 +#: build.c:196 #, fuzzy, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "%s ¤ò %s ¤Ë¤¹¤ë̾Á°¤ÎÊѹ¹¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: build.c:238 +#: build.c:236 #, fuzzy, c-format msgid "failed to stat %s: %m\n" msgstr "stat %s ¤Ë¼ºÇÔ: %s" -#: build.c:243 +#: build.c:241 #, fuzzy, c-format msgid "File %s is not a regular file.\n" msgstr "ÉáÄ̤Υե¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s\n" -#: build.c:252 +#: build.c:250 #, fuzzy, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ï ¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹¡£\n" #. parse up the build operators -#: build.c:307 +#: build.c:305 #, c-format msgid "Building target platforms: %s\n" msgstr "ºîÀ®Ã楿¡¼¥²¥Ã¥È¥×¥é¥Ã¥È¥Õ¥©¡¼¥à: %s\n" -#: build.c:322 +#: build.c:320 #, fuzzy, c-format msgid "Building for target %s\n" msgstr "¥¿¡¼¥²¥Ã¥È %s ÍѤ˺îÀ®Ãæ\n" @@ -2163,90 +2163,90 @@ msgid "generate signature" msgstr "PGP/GPG ½ð̾¤òÀ¸À®¤·¤Þ¤¹" #. @observer@ -#: lib/problems.c:226 +#: lib/problems.c:210 msgid "different" msgstr "" -#: lib/problems.c:234 +#: lib/problems.c:218 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¸þ¤±¤Ç¤¹" -#: lib/problems.c:239 +#: lib/problems.c:223 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë OS ¸þ¤±¤Ç¤¹" -#: lib/problems.c:244 +#: lib/problems.c:228 #, fuzzy, c-format msgid "package %s is already installed" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: lib/problems.c:249 +#: lib/problems.c:233 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Þ¤»¤ó" -#: lib/problems.c:254 +#: lib/problems.c:238 #, 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:259 +#: lib/problems.c:243 #, 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:264 +#: lib/problems.c:248 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s (%s-%s-%s¤è¤ê¤â¿·¤·¤¤¤â¤Î) ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ" "¤¹" -#: lib/problems.c:269 +#: lib/problems.c:253 #, fuzzy, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å" "¤Ç)" -#: lib/problems.c:279 +#: lib/problems.c:263 #, fuzzy, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å" "¤Ç)" -#: lib/problems.c:284 +#: lib/problems.c:268 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:272 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n" -#: lib/problems.c:292 +#: lib/problems.c:276 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n" -#: lib/problems.c:297 +#: lib/problems.c:281 #, fuzzy, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼ %d ¤¬¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤ÎÁàºîÃæ¤Ë¤ª¤­¤Þ¤·¤¿" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "conflicts with" msgstr " %s-%s-%s ¤È¶¥¹ç¤·¤Þ¤¹\n" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "is needed by" msgstr "¤Ï %s-%s-%s ¤ËɬÍפȤµ¤ì¤Æ¤¤¤Þ¤¹\n" @@ -2332,7 +2332,7 @@ msgstr "%s msgid "%s failed: %s\n" msgstr "%s ¼ºÇÔ" -#: lib/query.c:125 lib/rpmts.c:182 +#: lib/query.c:125 lib/rpmts.c:186 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "¥Õ¥©¡¼¥Þ¥Ã¥ÈÃæ¤Î¥¨¥é¡¼: %s\n" @@ -2377,7 +2377,7 @@ msgid "can't query %s: %s\n" msgstr "%s ¤òºï½ü(unlink)¤Ç¤­¤Þ¤»¤ó: %s\n" #: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n" @@ -2461,7 +2461,7 @@ msgstr " msgid "record %u could not be read\n" msgstr "¥ì¥³¡¼¥É %d ¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n" -#: lib/query.c:963 lib/rpminstall.c:678 +#: lib/query.c:963 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" @@ -2616,7 +2616,7 @@ msgstr " msgid "file %s requires a newer version of RPM\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¤Ï¤è¤ê¿·¤·¤¤ RPM ¤Î¥Ð¡¼¥¸¥ç¥ó¤¬É¬ÍפǤ¹\n" -#: lib/rpminstall.c:486 lib/rpminstall.c:744 +#: lib/rpminstall.c:486 lib/rpminstall.c:743 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó\n" @@ -2626,52 +2626,48 @@ msgstr "%s msgid "found %d source and %d binary packages\n" msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿\n" -#: lib/rpminstall.c:540 +#: lib/rpminstall.c:538 lib/rpminstall.c:1076 #, fuzzy msgid "Failed dependencies:\n" msgstr "°Í¸À­¤Î·çÇ¡:\n" -#: lib/rpminstall.c:547 +#: lib/rpminstall.c:545 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:579 +#: lib/rpminstall.c:577 msgid "installing binary packages\n" msgstr "¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:599 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s" -#: lib/rpminstall.c:681 +#: lib/rpminstall.c:678 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¤ÏÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹\n" -#: lib/rpminstall.c:705 +#: lib/rpminstall.c:703 msgid "removing these packages would break dependencies:\n" msgstr "¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë¤È°Í¸À­¤òÇ˲õ¤·¤Þ¤¹:\n" -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:730 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:736 #, c-format msgid "Installing %s\n" msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n" -#: lib/rpminstall.c:1073 +#: lib/rpminstall.c:1070 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpminstall.c:1080 -msgid "failed dependencies:\n" -msgstr "°Í¸À­¤Î·çÇ¡:\n" - #: lib/rpmlead.c:47 #, fuzzy, c-format msgid "read failed: %s (%d)\n" @@ -2772,7 +2768,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Æɤ߹þ¤à¤¿¤á¤Ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s¡£" -#: lib/rpmts.c:94 lib/rpmts.c:136 +#: lib/rpmts.c:95 lib/rpmts.c:137 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" @@ -2933,21 +2929,21 @@ msgstr "%s msgid "excluding directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n" -#: lib/transaction.c:1081 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "¥Þ¥¦¥ó¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥ê¥¹¥È¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹\n" -#: lib/verify.c:329 +#: lib/verify.c:330 #, fuzzy, c-format msgid "missing %s" msgstr "%s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" -#: lib/verify.c:424 +#: lib/verify.c:426 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À­¤òËþ¤¿¤·¤Æ¤¤¤Þ¤»¤ó:" -#: lib/verify.c:464 +#: lib/verify.c:466 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3554,6 +3550,9 @@ msgstr "url msgid "failed to create %s: %s\n" msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" +#~ msgid "failed dependencies:\n" +#~ msgstr "°Í¸À­¤Î·çÇ¡:\n" + #, fuzzy #~ msgid "%9s: (%s, %s) added to Depends cache.\n" #~ msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" diff --git a/po/ko.po b/po/ko.po index dd6b10df9..b230ec26d 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: 2002-04-12 21:24-0400\n" +"POT-Creation-Date: 2002-04-13 14:47-0400\n" "PO-Revision-Date: 2001-09-07 22:03+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -9,53 +9,54 @@ msgstr "" "Content-Type: text/plain; charset=EUC-KR\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:39 -msgid "failed build dependencies:\n" +#: build.c:38 +#, fuzzy +msgid "Failed build dependencies:\n" msgstr "ÀÇÁ¸¼º ¹®Á¦·Î Á¦ÀÛ¿¡ ½ÇÆÐÇÔ:\n" -#: build.c:71 +#: build.c:69 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "%s spec ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n" -#: build.c:151 build.c:163 +#: build.c:149 build.c:161 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "tar ÆÄÀÌÇÁ¸¦ ¿©´Âµ¥ ½ÇÆÐÇÔ: %m\n" #. Give up -#: build.c:170 +#: build.c:168 #, c-format msgid "Failed to read spec file from %s\n" msgstr "%s ¿¡¼­ spec ÆÄÀÏÀ» Àдµ¥ ½ÇÆÐÇß½À´Ï´Ù\n" -#: build.c:198 +#: build.c:196 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "%s ¿¡¼­ %s (À¸)·Î À̸§ º¯°æÇϴµ¥ ½ÇÆÐÇÔ: %m\n" -#: build.c:238 +#: build.c:236 #, c-format msgid "failed to stat %s: %m\n" msgstr "%s ÀÇ »óÅÂ(stat)¸¦ Ç¥½ÃÇϴµ¥ ½ÇÆÐÇÔ: %m\n" -#: build.c:243 +#: build.c:241 #, c-format msgid "File %s is not a regular file.\n" msgstr "%s ÆÄÀÏÀº Á¤±Ô(regular) ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù.\n" -#: build.c:252 +#: build.c:250 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "%s ÆÄÀÏÀº spec ÆÄÀÏÀÌ ¾Æ´Ñ °Í °°½À´Ï´Ù.\n" #. parse up the build operators -#: build.c:307 +#: build.c:305 #, c-format msgid "Building target platforms: %s\n" msgstr "¸ñÇ¥´ë»ó(target) Ç÷§ÆûÀ¸·Î Á¦ÀÛ Áß: %s\n" -#: build.c:322 +#: build.c:320 #, c-format msgid "Building for target %s\n" msgstr "%s (À»)¸¦ Á¦ÀÛÇÏ°í ÀÖ½À´Ï´Ù\n" @@ -2061,87 +2062,87 @@ msgid "generate signature" msgstr "¼­¸íÀ» ÀÛ¼ºÇÕ´Ï´Ù" #. @observer@ -#: lib/problems.c:226 +#: lib/problems.c:210 msgid "different" msgstr "" -#: lib/problems.c:234 +#: lib/problems.c:218 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "%s (Àº)´Â ´Ù¸¥ ¾ÆÅ°ÅØÃĸ¦ À§ÇÑ ÆÐÅ°ÁöÀÔ´Ï´Ù" -#: lib/problems.c:239 +#: lib/problems.c:223 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "%s (Àº)´Â ´Ù¸¥ ¿î¿µÃ¼Á¦¸¦ À§ÇÑ ÆÐÅ°ÁöÀÔ´Ï´Ù" -#: lib/problems.c:244 +#: lib/problems.c:228 #, c-format msgid "package %s is already installed" msgstr "%s ÆÐÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/problems.c:249 +#: lib/problems.c:233 #, c-format msgid "path %s in package %s is not relocateable" msgstr "%2$s ÆÐÅ°Áö ¾ÈÀÇ %1$s °æ·Î´Â Àç¹èÄ¡ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: lib/problems.c:254 +#: lib/problems.c:238 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "%2$s (¿Í)°ú %3$s ÀÇ ¼³Ä¡ °úÁ¤¿¡¼­ %1$s ÆÄÀÏÀÌ ¼­·Î Ãæµ¹ÇÕ´Ï´Ù" -#: lib/problems.c:259 +#: lib/problems.c:243 #, 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:264 +#: lib/problems.c:248 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "%s ÆÐÅ°Áö (%s º¸´Ù ÃÖ½ÅÀÇ ÆÐÅ°Áö)´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/problems.c:269 +#: lib/problems.c:253 #, 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:279 +#: lib/problems.c:263 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" "%3$s ÆÄÀϽýºÅÛ »ó¿¡¼­ %1$s ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÒ °æ¿ì¿¡´Â %2$ld ÀÇ ¾ÆÀ̳ëµå(inode)" "°¡ ÇÊ¿äÇÕ´Ï´Ù" -#: lib/problems.c:284 +#: lib/problems.c:268 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" "%s ÆÐÅ°ÁöÀÇ ¼±(pre)-Æ®·£Àè¼Ç ½Ã½ºÅÛÄÝ(syscall): %s (ÀÌ)°¡ ½ÇÆÐÇß½À´Ï´Ù: %s" -#: lib/problems.c:288 +#: lib/problems.c:272 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "%s-%s-%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n" -#: lib/problems.c:292 +#: lib/problems.c:276 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "%s-%s-%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n" -#: lib/problems.c:297 +#: lib/problems.c:281 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" "%2$s ÆÐÅ°Áö¸¦ ó¸®ÇÏ´Â °úÁ¤¿¡¼­ ¾Ë ¼ö ¾ø´Â ¿À·ù %1$d (ÀÌ)°¡ ¹ß»ýÇß½À´Ï´Ù" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "conflicts with" msgstr " %s-%s-%s (¿Í)°ú Ãæµ¹ÇÕ´Ï´Ù\n" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "is needed by" msgstr " (Àº)´Â %s-%s-%s ¿¡¼­ ÇÊ¿ä·Î ÇÕ´Ï´Ù\n" @@ -2230,7 +2231,7 @@ msgstr "%2$s msgid "%s failed: %s\n" msgstr "%s (ÀÌ)°¡ ½ÇÆÐÇÔ: %s\n" -#: lib/query.c:125 lib/rpmts.c:182 +#: lib/query.c:125 lib/rpmts.c:186 #, c-format msgid "incorrect format: %s\n" msgstr "¿Ã¹Ù¸£Áö ¸øÇÑ Çü½Ä: %s\n" @@ -2274,7 +2275,7 @@ msgid "can't query %s: %s\n" msgstr "%s (À»)¸¦ ÁúÀÇÇÒ ¼ö ¾øÀ½: %s\n" #: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "%s (À»)¸¦ ¿©´Âµ¥ ½ÇÆÐÇÔ: %s\n" @@ -2357,7 +2358,7 @@ msgstr " msgid "record %u could not be read\n" msgstr "±â·Ï(record) ¹øÈ£ %u (Àº)´Â ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: lib/query.c:963 lib/rpminstall.c:678 +#: lib/query.c:963 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "%s ÆÐÅ°Áö´Â ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n" @@ -2509,7 +2510,7 @@ msgstr "%s msgid "file %s requires a newer version of RPM\n" msgstr "%s ÆÄÀÏÀÌ ÃֽŠ¹öÀüÀÇ RPMÀ» ÇÊ¿ä·Î ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:486 lib/rpminstall.c:744 +#: lib/rpminstall.c:486 lib/rpminstall.c:743 #, c-format msgid "%s cannot be installed\n" msgstr "%s (Àº)´Â ¼³Ä¡µÉ ¼ö ¾ø½À´Ï´Ù\n" @@ -2519,52 +2520,48 @@ msgstr "%s ( msgid "found %d source and %d binary packages\n" msgstr "%d ÀÇ ¼Ò½º¿Í %d ÀÇ ¹ÙÀ̳ʸ® ÆÐÅ°Áö¸¦ ã¾Ò½À´Ï´Ù\n" -#: lib/rpminstall.c:540 +#: lib/rpminstall.c:538 lib/rpminstall.c:1076 #, fuzzy msgid "Failed dependencies:\n" msgstr "ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇØ ½ÇÆÐÇÔ:\n" -#: lib/rpminstall.c:547 +#: lib/rpminstall.c:545 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:579 +#: lib/rpminstall.c:577 msgid "installing binary packages\n" msgstr "¹ÙÀ̳ʸ® ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open file %s: %s\n" msgstr "%s ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n" -#: lib/rpminstall.c:681 +#: lib/rpminstall.c:678 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¿©·¯°³ÀÇ ÆÐÅ°Áö¸¦ ÁöÁ¤ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:705 +#: lib/rpminstall.c:703 msgid "removing these packages would break dependencies:\n" msgstr "ÀÌ ÆÐÅ°ÁöµéÀ» Á¦°ÅÇϸé ÀÇÁ¸¼ºÀÌ ±úÁú ¼ö ÀÖÀ½:\n" -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:730 #, c-format msgid "cannot open %s: %s\n" msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:736 #, c-format msgid "Installing %s\n" msgstr "%s (À»)¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:1073 +#: lib/rpminstall.c:1070 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpminstall.c:1080 -msgid "failed dependencies:\n" -msgstr "ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇØ ½ÇÆÐÇÔ:\n" - #: lib/rpmlead.c:47 #, c-format msgid "read failed: %s (%d)\n" @@ -2665,7 +2662,7 @@ msgstr "%s ( msgid "Unable to open %s for reading: %s.\n" msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s.\n" -#: lib/rpmts.c:94 lib/rpmts.c:136 +#: lib/rpmts.c:95 lib/rpmts.c:137 #, c-format msgid "cannot open Packages database in %s\n" msgstr "%s ¾ÈÀÇ ÆÐÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n" @@ -2819,21 +2816,21 @@ msgstr "missingok msgid "excluding directory %s\n" msgstr "%s µð·ºÅ丮¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" -#: lib/transaction.c:1081 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "¸¶¿îÆ®µÈ ÆÄÀϽýºÅÛÀÇ ¸ñ·ÏÀ» ¼öÁýÇÏ°í ÀÖ½À´Ï´Ù\n" -#: lib/verify.c:329 +#: lib/verify.c:330 #, c-format msgid "missing %s" msgstr "´ÙÀ½À» ãÀ» ¼ö ¾ø½À´Ï´Ù %s" -#: lib/verify.c:424 +#: lib/verify.c:426 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "%s-%s-%s ¿¡ ÀÇÁ¸¼º ¹®Á¦ ¹ß»ý: " -#: lib/verify.c:464 +#: lib/verify.c:466 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3433,6 +3430,9 @@ msgstr "URL msgid "failed to create %s: %s\n" msgstr "%s (À»)¸¦ »ý¼ºÇϴµ¥ ½ÇÆÐÇÔ: %s\n" +#~ msgid "failed dependencies:\n" +#~ msgstr "ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇØ ½ÇÆÐÇÔ:\n" + #, fuzzy #~ msgid "%9s: (%s, %s) added to Depends cache.\n" #~ msgstr "%s: (%s, %s) ÀÇÁ¸(Depends) ij½Ã¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù.\n" diff --git a/po/no.po b/po/no.po index bcf5a0745..b5d69bc33 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: 2002-04-12 21:24-0400\n" +"POT-Creation-Date: 2002-04-13 14:47-0400\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -9,53 +9,54 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:39 -msgid "failed build dependencies:\n" +#: build.c:38 +#, fuzzy +msgid "Failed build dependencies:\n" msgstr "feil med avhengigheter under bygging:\n" -#: build.c:71 +#: build.c:69 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: build.c:151 build.c:163 +#: build.c:149 build.c:161 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "Kunne ikke åpne tar-rør: %m\n" #. Give up -#: build.c:170 +#: build.c:168 #, c-format msgid "Failed to read spec file from %s\n" msgstr "Feil under lesing av spec-fil fra %s\n" -#: build.c:198 +#: build.c:196 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "Feil under endring av navn fra %s til %s: %m\n" -#: build.c:238 +#: build.c:236 #, c-format msgid "failed to stat %s: %m\n" msgstr "kunne ikke kjøre stat på %s: %m\n" -#: build.c:243 +#: build.c:241 #, c-format msgid "File %s is not a regular file.\n" msgstr "Fil %s er ikke en vanlig fil.\n" -#: build.c:252 +#: build.c:250 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "Fil %s ser ikke ut til å være en spec-fil.\n" #. parse up the build operators -#: build.c:307 +#: build.c:305 #, c-format msgid "Building target platforms: %s\n" msgstr "Bygger målplattformene: %s\n" -#: build.c:322 +#: build.c:320 #, c-format msgid "Building for target %s\n" msgstr "Bygger for mål %s\n" @@ -2047,81 +2048,81 @@ msgid "generate signature" msgstr "generer signatur" #. @observer@ -#: lib/problems.c:226 +#: lib/problems.c:210 msgid "different" msgstr "" -#: lib/problems.c:234 +#: lib/problems.c:218 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "pakke %s er for en annen arkitektur" -#: lib/problems.c:239 +#: lib/problems.c:223 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "pakke %s er for et annet operativsystem" -#: lib/problems.c:244 +#: lib/problems.c:228 #, c-format msgid "package %s is already installed" msgstr "pakke %s er allerede installert" -#: lib/problems.c:249 +#: lib/problems.c:233 #, c-format msgid "path %s in package %s is not relocateable" msgstr "sti %s i pakke %s kan ikke relokeres" -#: lib/problems.c:254 +#: lib/problems.c:238 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:243 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:264 +#: lib/problems.c:248 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:253 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:263 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:284 +#: lib/problems.c:268 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:272 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "pakke %s er i konflikt: %s\n" -#: lib/problems.c:292 +#: lib/problems.c:276 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "pakke %s er i konflikt: %s\n" -#: lib/problems.c:297 +#: lib/problems.c:281 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "conflicts with" msgstr " er i konflikt med %s-%s-%s\n" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "is needed by" msgstr " kreves av %s-%s-%s\n" @@ -2204,7 +2205,7 @@ msgstr "klarte ikke msgid "%s failed: %s\n" msgstr "%s feilet\n" -#: lib/query.c:125 lib/rpmts.c:182 +#: lib/query.c:125 lib/rpmts.c:186 #, c-format msgid "incorrect format: %s\n" msgstr "ukorrekt format: %s\n" @@ -2248,7 +2249,7 @@ msgid "can't query %s: %s\n" msgstr "kan ikke spørre på %s: %s\n" #: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "feil under åpning av %s: %s\n" @@ -2331,7 +2332,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:963 lib/rpminstall.c:678 +#: lib/query.c:963 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "pakke %s er ikke installert\n" @@ -2479,7 +2480,7 @@ msgstr "feil under lesing fra fil %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "fil %s trenger en nyere versjon av RPM\n" -#: lib/rpminstall.c:486 lib/rpminstall.c:744 +#: lib/rpminstall.c:486 lib/rpminstall.c:743 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2489,52 +2490,48 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "fant %d kilde- og %d binærpakker\n" -#: lib/rpminstall.c:540 +#: lib/rpminstall.c:538 lib/rpminstall.c:1076 #, fuzzy msgid "Failed dependencies:\n" msgstr "feilede avhengigheter:\n" -#: lib/rpminstall.c:547 +#: lib/rpminstall.c:545 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:579 +#: lib/rpminstall.c:577 msgid "installing binary packages\n" msgstr "installerer binærpakker\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:681 +#: lib/rpminstall.c:678 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" spesifiserer flere pakker\n" -#: lib/rpminstall.c:705 +#: lib/rpminstall.c:703 msgid "removing these packages would break dependencies:\n" msgstr "fjerning av disse pakkene vil ødelegge avhengigheter:\n" -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:730 #, c-format msgid "cannot open %s: %s\n" msgstr "kan ikke åpne %s: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:736 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" -#: lib/rpminstall.c:1073 +#: lib/rpminstall.c:1070 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpminstall.c:1080 -msgid "failed dependencies:\n" -msgstr "feilede avhengigheter:\n" - #: lib/rpmlead.c:47 #, c-format msgid "read failed: %s (%d)\n" @@ -2635,7 +2632,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: lib/rpmts.c:94 lib/rpmts.c:136 +#: lib/rpmts.c:95 lib/rpmts.c:137 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kan ikke åpne pakkedatabase i %s\n" @@ -2788,21 +2785,21 @@ msgstr "" msgid "excluding directory %s\n" msgstr "ekskluderer katalog %s\n" -#: lib/transaction.c:1081 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "henter liste over monterte filsystemer\n" -#: lib/verify.c:329 +#: lib/verify.c:330 #, c-format msgid "missing %s" msgstr "mangler %s" -#: lib/verify.c:424 +#: lib/verify.c:426 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "feilede avhengigheter:\n" -#: lib/verify.c:464 +#: lib/verify.c:466 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3386,6 +3383,9 @@ msgstr "url-port m msgid "failed to create %s: %s\n" msgstr "kunne ikke opprette %s: %s\n" +#~ msgid "failed dependencies:\n" +#~ msgstr "feilede avhengigheter:\n" + #~ msgid "(unknown type)" #~ msgstr "(ukjent type)" diff --git a/po/pl.po b/po/pl.po index ad3d8ade8..22694189d 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: 2002-04-12 21:24-0400\n" +"POT-Creation-Date: 2002-04-13 14:47-0400\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -16,53 +16,54 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:39 -msgid "failed build dependencies:\n" +#: build.c:38 +#, fuzzy +msgid "Failed build dependencies:\n" msgstr "niespe³nione zale¿no¶ci:\n" -#: build.c:71 +#: build.c:69 #, fuzzy, c-format msgid "Unable to open spec file %s: %s\n" msgstr "Nie mo¿na otworzyæ pliku spec: %s\n" -#: build.c:151 build.c:163 +#: build.c:149 build.c:161 #, fuzzy, c-format msgid "Failed to open tar pipe: %m\n" msgstr "Otwarcie potoku tara nie powiod³o siê: %s\n" #. Give up -#: build.c:170 +#: build.c:168 #, fuzzy, c-format msgid "Failed to read spec file from %s\n" msgstr "Odczytanie pliku spec z %s nie powiod³o siê\n" -#: build.c:198 +#: build.c:196 #, fuzzy, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "Zmiana nazwy %s na %s nie powiod³a siê\n" -#: build.c:238 +#: build.c:236 #, fuzzy, c-format msgid "failed to stat %s: %m\n" msgstr "stat nie powiod³o siê %s: %s" -#: build.c:243 +#: build.c:241 #, fuzzy, c-format msgid "File %s is not a regular file.\n" msgstr "Plik: %s nie jest regularnym plikiem\n" -#: build.c:252 +#: build.c:250 #, fuzzy, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "%s nie wygl±da na pakiet RPM\n" #. parse up the build operators -#: build.c:307 +#: build.c:305 #, c-format msgid "Building target platforms: %s\n" msgstr "Budowanie dla platform: %s\n" -#: build.c:322 +#: build.c:320 #, c-format msgid "Building for target %s\n" msgstr "Budowanie dla %s\n" @@ -2127,83 +2128,83 @@ msgid "generate signature" msgstr "generuj sygnaturê PGP/GPG" #. @observer@ -#: lib/problems.c:226 +#: lib/problems.c:210 msgid "different" msgstr "" -#: lib/problems.c:234 +#: lib/problems.c:218 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "pakiet %s-%s-%s zbudowano dla innej architektury" -#: lib/problems.c:239 +#: lib/problems.c:223 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "pakiet %s-%s-%s zbudowano dla innego systemu operacyjnego" -#: lib/problems.c:244 +#: lib/problems.c:228 #, fuzzy, c-format msgid "package %s is already installed" msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany" -#: lib/problems.c:249 +#: lib/problems.c:233 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "pakiet %s nie jest przesuwalny\n" -#: lib/problems.c:254 +#: lib/problems.c:238 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:243 #, 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:264 +#: lib/problems.c:248 #, 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:269 +#: lib/problems.c:253 #, 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:279 +#: lib/problems.c:263 #, 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:284 +#: lib/problems.c:268 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:272 #, 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:292 +#: lib/problems.c:276 #, 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:297 +#: lib/problems.c:281 #, fuzzy, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "wyst±pi³ nieznany b³±d %d w trakcie manipulowania pakietem %s-%s-%s" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "conflicts with" msgstr " jest w konflikcie z %s-%s-%s\n" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "is needed by" msgstr " jest wymagany przez %s-%s-%s\n" @@ -2288,7 +2289,7 @@ msgstr "nie mo msgid "%s failed: %s\n" msgstr "%s nie powiod³o siê" -#: lib/query.c:125 lib/rpmts.c:182 +#: lib/query.c:125 lib/rpmts.c:186 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "b³±d w formacie: %s\n" @@ -2333,7 +2334,7 @@ msgid "can't query %s: %s\n" msgstr "nie mo¿na odwi±zaæ %s: %s\n" #: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "otwarcie %s nie powiod³o siê\n" @@ -2417,7 +2418,7 @@ msgstr "numer rekordu pakietu: %d\n" msgid "record %u could not be read\n" msgstr "nie mo¿na odczytaæ rekordu %d\n" -#: lib/query.c:963 lib/rpminstall.c:678 +#: lib/query.c:963 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "pakiet %s nie jest zainstalowany\n" @@ -2570,7 +2571,7 @@ msgstr "b msgid "file %s requires a newer version of RPM\n" msgstr "plik %s wymaga nowszej wersji RPM\n" -#: lib/rpminstall.c:486 lib/rpminstall.c:744 +#: lib/rpminstall.c:486 lib/rpminstall.c:743 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie mo¿e byæ zainstalowany\n" @@ -2580,52 +2581,48 @@ msgstr "%s nie mo msgid "found %d source and %d binary packages\n" msgstr "znaleziono %d pakietów ¼ród³owych i %d binarnych\n" -#: lib/rpminstall.c:540 +#: lib/rpminstall.c:538 lib/rpminstall.c:1076 #, fuzzy msgid "Failed dependencies:\n" msgstr "niespe³nione zale¿no¶ci:\n" -#: lib/rpminstall.c:547 +#: lib/rpminstall.c:545 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:579 +#: lib/rpminstall.c:577 msgid "installing binary packages\n" msgstr "instalacja pakietów binarnych\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:599 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nie mo¿na otworzyæ pliku %s: %s" -#: lib/rpminstall.c:681 +#: lib/rpminstall.c:678 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" okre¶la wiele pakietów\n" -#: lib/rpminstall.c:705 +#: lib/rpminstall.c:703 msgid "removing these packages would break dependencies:\n" msgstr "usuniêcie tych pakietów zerwie zale¿no¶ci:\n" -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:730 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie mo¿na otworzyæ %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:736 #, c-format msgid "Installing %s\n" msgstr "Instalacja %s\n" -#: lib/rpminstall.c:1073 +#: lib/rpminstall.c:1070 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpminstall.c:1080 -msgid "failed dependencies:\n" -msgstr "niespe³nione zale¿no¶ci:\n" - #: lib/rpmlead.c:47 #, fuzzy, c-format msgid "read failed: %s (%d)\n" @@ -2726,7 +2723,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Nie mo¿na otworzyæ %s do odczytu: %s." -#: lib/rpmts.c:94 lib/rpmts.c:136 +#: lib/rpmts.c:95 lib/rpmts.c:137 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" @@ -2886,21 +2883,21 @@ msgstr "%s pomini msgid "excluding directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: lib/transaction.c:1081 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:329 +#: lib/verify.c:330 #, fuzzy, c-format msgid "missing %s" msgstr "brak %s\n" -#: lib/verify.c:424 +#: lib/verify.c:426 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: " -#: lib/verify.c:464 +#: lib/verify.c:466 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3496,6 +3493,9 @@ msgstr "port musi by msgid "failed to create %s: %s\n" msgstr "utworzenie %s nie powiod³o siê\n" +#~ msgid "failed dependencies:\n" +#~ msgstr "niespe³nione zale¿no¶ci:\n" + #, fuzzy #~ msgid "%9s: (%s, %s) added to Depends cache.\n" #~ msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 069f3bf0b..0c3059eaf 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,61 +4,61 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-12 21:24-0400\n" +"POT-Creation-Date: 2002-04-13 14:47-0400\n" -#: build.c:39 +#: build.c:38 #, fuzzy -msgid "failed build dependencies:\n" +msgid "Failed build dependencies:\n" msgstr "lista dependncias do pacote" # , c-format -#: build.c:71 +#: build.c:69 #, fuzzy, c-format msgid "Unable to open spec file %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build.c:151 build.c:163 +#: build.c:149 build.c:161 #, fuzzy, c-format msgid "Failed to open tar pipe: %m\n" msgstr "No consegui abrir: %s\n" # , c-format #. Give up -#: build.c:170 +#: build.c:168 #, fuzzy, c-format msgid "Failed to read spec file from %s\n" msgstr "No consegui ler o arquivo spec de %s\n" # , c-format -#: build.c:198 +#: build.c:196 #, fuzzy, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "No consegui ler o arquivo spec de %s\n" # , c-format -#: build.c:238 +#: build.c:236 #, fuzzy, c-format msgid "failed to stat %s: %m\n" msgstr "No consegui abrir: %s\n" -#: build.c:243 +#: build.c:241 #, fuzzy, c-format msgid "File %s is not a regular file.\n" msgstr "no foi passado pacote para instalao" -#: build.c:252 +#: build.c:250 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "" #. parse up the build operators -#: build.c:307 +#: build.c:305 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:322 +#: build.c:320 #, fuzzy, c-format msgid "Building for target %s\n" msgstr "instale pacote" @@ -2252,80 +2252,80 @@ msgid "generate signature" msgstr "gere assinatura PGP" #. @observer@ -#: lib/problems.c:226 +#: lib/problems.c:210 msgid "different" msgstr "" -#: lib/problems.c:234 +#: lib/problems.c:218 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:239 +#: lib/problems.c:223 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:244 +#: lib/problems.c:228 #, fuzzy, c-format msgid "package %s is already installed" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:249 +#: lib/problems.c:233 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:254 +#: lib/problems.c:238 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:243 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:264 +#: lib/problems.c:248 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:269 +#: lib/problems.c:253 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:263 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:284 +#: lib/problems.c:268 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:272 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:292 +#: lib/problems.c:276 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "no foi passado pacote para instalao" -#: lib/problems.c:297 +#: lib/problems.c:281 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/problems.c:377 +#: lib/problems.c:362 msgid "conflicts with" msgstr "" -#: lib/problems.c:377 +#: lib/problems.c:362 msgid "is needed by" msgstr "" @@ -2411,7 +2411,7 @@ msgstr "No consegui abrir: %s\n" msgid "%s failed: %s\n" msgstr "Construo falhou.\n" -#: lib/query.c:125 lib/rpmts.c:182 +#: lib/query.c:125 lib/rpmts.c:186 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -2458,7 +2458,7 @@ msgid "can't query %s: %s\n" msgstr "No consegui abrir: %s\n" #: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:887 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "Construo falhou.\n" @@ -2544,7 +2544,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:963 lib/rpminstall.c:678 +#: lib/query.c:963 lib/rpminstall.c:675 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "no foi passado pacote para instalao" @@ -2708,7 +2708,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:486 lib/rpminstall.c:744 +#: lib/rpminstall.c:486 lib/rpminstall.c:743 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "no foi passado pacote para instalao" @@ -2718,57 +2718,52 @@ msgstr "no foi passado pacote para instalao" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:540 +#: lib/rpminstall.c:538 lib/rpminstall.c:1076 #, fuzzy msgid "Failed dependencies:\n" msgstr "lista dependncias do pacote" -#: lib/rpminstall.c:547 +#: lib/rpminstall.c:545 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:579 +#: lib/rpminstall.c:577 #, fuzzy msgid "installing binary packages\n" msgstr "instale pacote" # , c-format -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:599 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpminstall.c:681 +#: lib/rpminstall.c:678 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:705 +#: lib/rpminstall.c:703 #, fuzzy msgid "removing these packages would break dependencies:\n" msgstr "lista dependncias do pacote" # , c-format -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:730 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:736 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1073 +#: lib/rpminstall.c:1070 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "no foi passado pacote para desinstalao" -#: lib/rpminstall.c:1080 -#, fuzzy -msgid "failed dependencies:\n" -msgstr "lista dependncias do pacote" - # , c-format #: lib/rpmlead.c:47 #, fuzzy, c-format @@ -2877,7 +2872,7 @@ msgid "Unable to open %s for reading: %s.\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/rpmts.c:94 lib/rpmts.c:136 +#: lib/rpmts.c:95 lib/rpmts.c:137 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "No consegui abrir: %s\n" @@ -3045,21 +3040,21 @@ msgstr "" msgid "excluding directory %s\n" msgstr "RPM verso %s\n" -#: lib/transaction.c:1081 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:329 +#: lib/verify.c:330 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:424 +#: lib/verify.c:426 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "lista dependncias do pacote" -#: lib/verify.c:464 +#: lib/verify.c:466 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3669,6 +3664,10 @@ msgstr "" msgid "failed to create %s: %s\n" msgstr "No consegui abrir o pipe tar: %s\n" +#, fuzzy +#~ msgid "failed dependencies:\n" +#~ msgstr "lista dependncias do pacote" + #, fuzzy #~ msgid "rpm verify mode (legacy)" #~ msgstr "modo pesquisa" diff --git a/po/ro.po b/po/ro.po index f001c2754..9c9cd186b 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: 2002-04-12 21:24-0400\n" +"POT-Creation-Date: 2002-04-13 14:47-0400\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -9,53 +9,53 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:39 -msgid "failed build dependencies:\n" +#: build.c:38 +msgid "Failed build dependencies:\n" msgstr "" -#: build.c:71 +#: build.c:69 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "" -#: build.c:151 build.c:163 +#: build.c:149 build.c:161 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "" #. Give up -#: build.c:170 +#: build.c:168 #, c-format msgid "Failed to read spec file from %s\n" msgstr "" -#: build.c:198 +#: build.c:196 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "" -#: build.c:238 +#: build.c:236 #, c-format msgid "failed to stat %s: %m\n" msgstr "" -#: build.c:243 +#: build.c:241 #, c-format msgid "File %s is not a regular file.\n" msgstr "" -#: build.c:252 +#: build.c:250 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "" #. parse up the build operators -#: build.c:307 +#: build.c:305 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:322 +#: build.c:320 #, c-format msgid "Building for target %s\n" msgstr "" @@ -2008,80 +2008,80 @@ msgid "generate signature" msgstr "" #. @observer@ -#: lib/problems.c:226 +#: lib/problems.c:210 msgid "different" msgstr "" -#: lib/problems.c:234 +#: lib/problems.c:218 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/problems.c:239 +#: lib/problems.c:223 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:244 +#: lib/problems.c:228 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:249 +#: lib/problems.c:233 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:254 +#: lib/problems.c:238 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:243 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:264 +#: lib/problems.c:248 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:253 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:263 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:284 +#: lib/problems.c:268 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:272 #, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "" -#: lib/problems.c:292 +#: lib/problems.c:276 #, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "" -#: lib/problems.c:297 +#: lib/problems.c:281 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/problems.c:377 +#: lib/problems.c:362 msgid "conflicts with" msgstr "" -#: lib/problems.c:377 +#: lib/problems.c:362 msgid "is needed by" msgstr "" @@ -2163,7 +2163,7 @@ msgstr "" msgid "%s failed: %s\n" msgstr "" -#: lib/query.c:125 lib/rpmts.c:182 +#: lib/query.c:125 lib/rpmts.c:186 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -2207,7 +2207,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2290,7 +2290,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:963 lib/rpminstall.c:678 +#: lib/query.c:963 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2438,7 +2438,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:486 lib/rpminstall.c:744 +#: lib/rpminstall.c:486 lib/rpminstall.c:743 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2448,51 +2448,47 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:540 +#: lib/rpminstall.c:538 lib/rpminstall.c:1076 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:547 +#: lib/rpminstall.c:545 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:579 +#: lib/rpminstall.c:577 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:681 +#: lib/rpminstall.c:678 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:705 +#: lib/rpminstall.c:703 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:730 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:736 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1073 +#: lib/rpminstall.c:1070 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpminstall.c:1080 -msgid "failed dependencies:\n" -msgstr "" - #: lib/rpmlead.c:47 #, c-format msgid "read failed: %s (%d)\n" @@ -2593,7 +2589,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "" -#: lib/rpmts.c:94 lib/rpmts.c:136 +#: lib/rpmts.c:95 lib/rpmts.c:137 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" @@ -2744,21 +2740,21 @@ msgstr "" msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1081 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:329 +#: lib/verify.c:330 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:424 +#: lib/verify.c:426 #, c-format msgid "Unsatisifed dependencies for %s: " msgstr "" -#: lib/verify.c:464 +#: lib/verify.c:466 #, 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 ddaa5eed7..a384bca7d 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-04-12 21:24-0400\n" +"POT-Creation-Date: 2002-04-13 14:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,53 +15,53 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: build.c:39 -msgid "failed build dependencies:\n" +#: build.c:38 +msgid "Failed build dependencies:\n" msgstr "" -#: build.c:71 +#: build.c:69 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "" -#: build.c:151 build.c:163 +#: build.c:149 build.c:161 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "" #. Give up -#: build.c:170 +#: build.c:168 #, c-format msgid "Failed to read spec file from %s\n" msgstr "" -#: build.c:198 +#: build.c:196 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "" -#: build.c:238 +#: build.c:236 #, c-format msgid "failed to stat %s: %m\n" msgstr "" -#: build.c:243 +#: build.c:241 #, c-format msgid "File %s is not a regular file.\n" msgstr "" -#: build.c:252 +#: build.c:250 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "" #. parse up the build operators -#: build.c:307 +#: build.c:305 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:322 +#: build.c:320 #, c-format msgid "Building for target %s\n" msgstr "" @@ -2014,80 +2014,80 @@ msgid "generate signature" msgstr "" #. @observer@ -#: lib/problems.c:226 +#: lib/problems.c:210 msgid "different" msgstr "" -#: lib/problems.c:234 +#: lib/problems.c:218 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/problems.c:239 +#: lib/problems.c:223 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:244 +#: lib/problems.c:228 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/problems.c:249 +#: lib/problems.c:233 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/problems.c:254 +#: lib/problems.c:238 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:243 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:264 +#: lib/problems.c:248 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/problems.c:269 +#: lib/problems.c:253 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:263 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:284 +#: lib/problems.c:268 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:272 #, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "" -#: lib/problems.c:292 +#: lib/problems.c:276 #, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "" -#: lib/problems.c:297 +#: lib/problems.c:281 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/problems.c:377 +#: lib/problems.c:362 msgid "conflicts with" msgstr "" -#: lib/problems.c:377 +#: lib/problems.c:362 msgid "is needed by" msgstr "" @@ -2169,7 +2169,7 @@ msgstr "" msgid "%s failed: %s\n" msgstr "" -#: lib/query.c:125 lib/rpmts.c:182 +#: lib/query.c:125 lib/rpmts.c:186 #, c-format msgid "incorrect format: %s\n" msgstr "" @@ -2213,7 +2213,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2296,7 +2296,7 @@ msgstr "" msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:963 lib/rpminstall.c:678 +#: lib/query.c:963 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2444,7 +2444,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:486 lib/rpminstall.c:744 +#: lib/rpminstall.c:486 lib/rpminstall.c:743 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2454,51 +2454,47 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:540 +#: lib/rpminstall.c:538 lib/rpminstall.c:1076 msgid "Failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:547 +#: lib/rpminstall.c:545 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:579 +#: lib/rpminstall.c:577 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:681 +#: lib/rpminstall.c:678 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:705 +#: lib/rpminstall.c:703 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:730 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:736 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1073 +#: lib/rpminstall.c:1070 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpminstall.c:1080 -msgid "failed dependencies:\n" -msgstr "" - #: lib/rpmlead.c:47 #, c-format msgid "read failed: %s (%d)\n" @@ -2599,7 +2595,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "" -#: lib/rpmts.c:94 lib/rpmts.c:136 +#: lib/rpmts.c:95 lib/rpmts.c:137 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" @@ -2750,21 +2746,21 @@ msgstr "" msgid "excluding directory %s\n" msgstr "" -#: lib/transaction.c:1081 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:329 +#: lib/verify.c:330 #, c-format msgid "missing %s" msgstr "" -#: lib/verify.c:424 +#: lib/verify.c:426 #, c-format msgid "Unsatisifed dependencies for %s: " msgstr "" -#: lib/verify.c:464 +#: lib/verify.c:466 #, 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 9ecec88f4..519b0af0c 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: 2002-04-12 21:24-0400\n" +"POT-Creation-Date: 2002-04-13 14:47-0400\n" "PO-Revision-Date: 2001-08-29 13:55-0400\n" "Last-Translator: Eugene Kanter \n" "Language-Team: Black Cat Linux Team \n" @@ -11,53 +11,54 @@ msgstr "" "Date: 1999-04-03 12:20+0200\n" "X-Generator: KBabel 0.8\n" -#: build.c:39 -msgid "failed build dependencies:\n" +#: build.c:38 +#, fuzzy +msgid "Failed build dependencies:\n" msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÓÂÏÒËÉ:\n" -#: build.c:71 +#: build.c:69 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ %s: %s\n" -#: build.c:151 build.c:163 +#: build.c:149 build.c:161 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ËÁÎÁÌÁ tar: %m\n" #. Give up -#: build.c:170 +#: build.c:168 #, c-format msgid "Failed to read spec file from %s\n" msgstr "ïÛÉÂËÁ ÞÔÅÎÉÑ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ ÉÚ %s\n" -#: build.c:198 +#: build.c:196 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÉÍÅÎÏ×ÁÔØ %s × %s: %m\n" -#: build.c:238 +#: build.c:236 #, c-format msgid "failed to stat %s: %m\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÉÎÆÏÒÍÁÃÉÀ Ï %s: %m\n" -#: build.c:243 +#: build.c:241 #, c-format msgid "File %s is not a regular file.\n" msgstr "îÅ ÏÂÙÞÎÙÊ ÆÁÊÌ: %s.\n" -#: build.c:252 +#: build.c:250 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "æÁÊÌ %s ÎÅ ÐÏÈÏÖ ÎÁ ÆÁÊÌ ÓÐÅÃÉÆÉËÁÃÉÉ.\n" #. parse up the build operators -#: build.c:307 +#: build.c:305 #, c-format msgid "Building target platforms: %s\n" msgstr "ðÌÁÔÆÏÒÍÙ ÄÌÑ ÓÂÏÒËÉ: %s\n" -#: build.c:322 +#: build.c:320 #, c-format msgid "Building for target %s\n" msgstr "óÂÏÒËÁ ÄÌÑ ÐÌÁÔÆÏÒÍÙ %s\n" @@ -2080,81 +2081,81 @@ msgid "generate signature" msgstr "ÇÅÎÅÒÉÒÏ×ÁÔØ ÐÏÄÐÉÓØ" #. @observer@ -#: lib/problems.c:226 +#: lib/problems.c:210 msgid "different" msgstr "" -#: lib/problems.c:234 +#: lib/problems.c:218 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "ÐÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÁÒÈÉÔÅËÔÕÒÙ" -#: lib/problems.c:239 +#: lib/problems.c:223 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "ÐÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ" -#: lib/problems.c:244 +#: lib/problems.c:228 #, c-format msgid "package %s is already installed" msgstr "ÐÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/problems.c:249 +#: lib/problems.c:233 #, c-format msgid "path %s in package %s is not relocateable" msgstr "ÐÕÔØ %s × ÐÁËÅÔÅ %s - ÎÅ ÐÅÒÅÍÅÝÁÅÍÙÊ" -#: lib/problems.c:254 +#: lib/problems.c:238 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "ËÏÎÆÌÉËÔ ÆÁÊÌÁ %s ÐÒÉ ÐÏÐÙÔËÁÈ ÕÓÔÁÎÏ×ËÉ %s É %s" -#: lib/problems.c:259 +#: lib/problems.c:243 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "ÆÁÊÌ %s ÉÚ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ ÐÁËÅÔÁ %s ËÏÎÆÌÉËÔÕÅÔ Ó ÆÁÊÌÏÍ ÉÚ ÐÁËÅÔÁ %s" -#: lib/problems.c:264 +#: lib/problems.c:248 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "ÐÁËÅÔ %s (ËÏÔÏÒÙÊ ÎÏ×ÅÅ, ÞÅÍ %s) ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/problems.c:269 +#: lib/problems.c:253 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ %s ÎÕÖÎÏ %ld%cb ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s" -#: lib/problems.c:279 +#: lib/problems.c:263 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ %s ÎÕÖÎÏ %ld inodes ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s" -#: lib/problems.c:284 +#: lib/problems.c:268 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "ÐÁËÅÔ %s pre-transaction syscall(s): %s: ÏÛÉÂËÁ: %s" -#: lib/problems.c:288 +#: lib/problems.c:272 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n" -#: lib/problems.c:292 +#: lib/problems.c:276 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n" -#: lib/problems.c:297 +#: lib/problems.c:281 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ %d ÐÒÉ ÒÁÂÏÔÅ Ó ÐÁËÅÔÏÍ %s" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "conflicts with" msgstr " ËÏÎÆÌÉËÔÕÅÔ Ó %s-%s-%s\n" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "is needed by" msgstr " ÎÕÖÅÎ ÄÌÑ %s-%s-%s\n" @@ -2237,7 +2238,7 @@ msgstr "%s msgid "%s failed: %s\n" msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n" -#: lib/query.c:125 lib/rpmts.c:182 +#: lib/query.c:125 lib/rpmts.c:186 #, c-format msgid "incorrect format: %s\n" msgstr "ÏÛÉÂËÁ × ÆÏÒÍÁÔÅ: %s\n" @@ -2281,7 +2282,7 @@ msgid "can't query %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÒÏÓÉÔØ %s: %s\n" #: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" @@ -2364,7 +2365,7 @@ msgstr " msgid "record %u could not be read\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÚÁÐÉÓØ %u\n" -#: lib/query.c:963 lib/rpminstall.c:678 +#: lib/query.c:963 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" @@ -2516,7 +2517,7 @@ msgstr " msgid "file %s requires a newer version of RPM\n" msgstr "ÄÌÑ ÆÁÊÌÁ %s ÎÅÏÂÈÏÄÉÍÁ ÂÏÌÅÅ ÎÏ×ÁÑ ×ÅÒÓÉÑ RPM\n" -#: lib/rpminstall.c:486 lib/rpminstall.c:744 +#: lib/rpminstall.c:486 lib/rpminstall.c:743 #, c-format msgid "%s cannot be installed\n" msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n" @@ -2526,52 +2527,48 @@ msgstr "%s msgid "found %d source and %d binary packages\n" msgstr "ÎÁÊÄÅÎÏ %d ÉÓÈÏÄÎÙÈ É %d ÂÉÎÁÒÎÙÈ ÐÁËÅÔÏ×\n" -#: lib/rpminstall.c:540 +#: lib/rpminstall.c:538 lib/rpminstall.c:1076 #, fuzzy msgid "Failed dependencies:\n" msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" -#: lib/rpminstall.c:547 +#: lib/rpminstall.c:545 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:579 +#: lib/rpminstall.c:577 msgid "installing binary packages\n" msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÂÉÎÁÒÎÙÅ ÐÁËÅÔÙ\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open file %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %s: %s\n" -#: lib/rpminstall.c:681 +#: lib/rpminstall.c:678 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ÚÁÄÁÅÔ ÎÅÓËÏÌØËÏ ÐÁËÅÔÏ×\n" -#: lib/rpminstall.c:705 +#: lib/rpminstall.c:703 msgid "removing these packages would break dependencies:\n" msgstr "ÕÄÁÌÅÎÉÅ ÜÔÉÈ ÐÁËÅÔÏ× ÎÁÒÕÛÉÔ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:730 #, c-format msgid "cannot open %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:736 #, c-format msgid "Installing %s\n" msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ %s\n" -#: lib/rpminstall.c:1073 +#: lib/rpminstall.c:1070 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpminstall.c:1080 -msgid "failed dependencies:\n" -msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" - #: lib/rpmlead.c:47 #, c-format msgid "read failed: %s (%d)\n" @@ -2672,7 +2669,7 @@ msgstr " msgid "Unable to open %s for reading: %s.\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ: %s.\n" -#: lib/rpmts.c:94 lib/rpmts.c:136 +#: lib/rpmts.c:95 lib/rpmts.c:137 #, c-format msgid "cannot open Packages database in %s\n" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n" @@ -2827,21 +2824,21 @@ msgstr "%s msgid "excluding directory %s\n" msgstr "ÉÓËÌÀÞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: lib/transaction.c:1081 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "ÐÏÌÕÞÅÎÉÅ ÓÐÉÓËÁ ÓÍÏÎÔÉÒÏ×ÁÎÎÙÈ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ\n" -#: lib/verify.c:329 +#: lib/verify.c:330 #, c-format msgid "missing %s" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ %s" -#: lib/verify.c:424 +#: lib/verify.c:426 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: " -#: lib/verify.c:464 +#: lib/verify.c:466 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "%s-%s-%s: ÎÅÐÒÁ×ÉÌØÎÁÑ ÐÏÄÐÉÓØ ÏÂÌÁÓÔÉ ÚÁÇÏÌÏ×ËÁ ÐÁËÅÔÁ\n" @@ -3436,6 +3433,9 @@ msgstr "url msgid "failed to create %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n" +#~ msgid "failed dependencies:\n" +#~ msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" + #, fuzzy #~ msgid "%9s: (%s, %s) added to Depends cache.\n" #~ msgstr "%s: (%s, %s) ÄÏÂÁ×ÌÅÎÏ × ËÅÛ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" diff --git a/po/sk.po b/po/sk.po index 06402e7a5..2fe6f180d 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: 2002-04-12 21:24-0400\n" +"POT-Creation-Date: 2002-04-13 14:47-0400\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -9,54 +9,54 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:39 +#: build.c:38 #, fuzzy -msgid "failed build dependencies:\n" +msgid "Failed build dependencies:\n" msgstr "nevyrie¹ené závislosti:\n" -#: build.c:71 +#: build.c:69 #, fuzzy, c-format msgid "Unable to open spec file %s: %s\n" msgstr "Nie je mo¾né otvori» spec súbor: %s\n" -#: build.c:151 build.c:163 +#: build.c:149 build.c:161 #, fuzzy, c-format msgid "Failed to open tar pipe: %m\n" msgstr "Otvorenie rúry pre tar zlyhalo: %s\n" #. Give up -#: build.c:170 +#: build.c:168 #, fuzzy, c-format msgid "Failed to read spec file from %s\n" msgstr "Nie je mo¾né preèíta» spec súbor z %s\n" -#: build.c:198 +#: build.c:196 #, fuzzy, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "Nie je mo¾né premenova» %s na %s: %s\n" -#: build.c:238 +#: build.c:236 #, fuzzy, c-format msgid "failed to stat %s: %m\n" msgstr "nepodarilo sa zisti» stav %s: %s" -#: build.c:243 +#: build.c:241 #, fuzzy, c-format msgid "File %s is not a regular file.\n" msgstr "Súbor nie je obyèajný súbor: %s\n" -#: build.c:252 +#: build.c:250 #, fuzzy, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "%s zrejme nie je RPM balík\n" #. parse up the build operators -#: build.c:307 +#: build.c:305 #, fuzzy, c-format msgid "Building target platforms: %s\n" msgstr "predefinova» cieµovú platformu" -#: build.c:322 +#: build.c:320 #, fuzzy, c-format msgid "Building for target %s\n" msgstr "vyhµadáva sa balík %s\n" @@ -2126,81 +2126,81 @@ msgid "generate signature" msgstr "vytvori» PGP/GPG podpis" #. @observer@ -#: lib/problems.c:226 +#: lib/problems.c:210 msgid "different" msgstr "" -#: lib/problems.c:234 +#: lib/problems.c:218 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/problems.c:239 +#: lib/problems.c:223 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/problems.c:244 +#: lib/problems.c:228 #, fuzzy, c-format msgid "package %s is already installed" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/problems.c:249 +#: lib/problems.c:233 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/problems.c:254 +#: lib/problems.c:238 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:243 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/problems.c:264 +#: lib/problems.c:248 #, 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:269 +#: lib/problems.c:253 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:263 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:284 +#: lib/problems.c:268 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:272 #, 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:292 +#: lib/problems.c:276 #, 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:297 +#: lib/problems.c:281 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "conflicts with" msgstr " koliduje s %s-%s-%s\n" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "is needed by" msgstr " je vy¾adované %s-%s-%s\n" @@ -2285,7 +2285,7 @@ msgstr "nepodarilo sa otvori msgid "%s failed: %s\n" msgstr "%s zlyhalo" -#: lib/query.c:125 lib/rpmts.c:182 +#: lib/query.c:125 lib/rpmts.c:186 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "chyba formátu: %s\n" @@ -2330,7 +2330,7 @@ msgid "can't query %s: %s\n" msgstr "zmazanie %s zlyhalo: %s\n" #: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:887 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "otvorenie %s zlyhalo\n" @@ -2414,7 +2414,7 @@ msgstr "po msgid "record %u could not be read\n" msgstr "záznam %d nie je mo¾né preèíta»\n" -#: lib/query.c:963 lib/rpminstall.c:678 +#: lib/query.c:963 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "balík %s nie je nain¹talovaný\n" @@ -2567,7 +2567,7 @@ msgstr "chyba pri vytv msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:486 lib/rpminstall.c:744 +#: lib/rpminstall.c:486 lib/rpminstall.c:743 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie je mo¾né nain¹talova»\n" @@ -2577,52 +2577,48 @@ msgstr "%s nie je mo 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:540 +#: lib/rpminstall.c:538 lib/rpminstall.c:1076 #, fuzzy msgid "Failed dependencies:\n" msgstr "nevyrie¹ené závislosti:\n" -#: lib/rpminstall.c:547 +#: lib/rpminstall.c:545 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:579 +#: lib/rpminstall.c:577 msgid "installing binary packages\n" msgstr "in¹talujú sa binárne balíky\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:599 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nie je mo¾né otvori» súbor %s: %s" -#: lib/rpminstall.c:681 +#: lib/rpminstall.c:678 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¹pecifikuje viac balíkov\n" -#: lib/rpminstall.c:705 +#: lib/rpminstall.c:703 msgid "removing these packages would break dependencies:\n" msgstr "odstránenie týchto balíkov by poru¹ilo závislosti:\n" -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:730 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie je mo¾né otvori» %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:736 #, c-format msgid "Installing %s\n" msgstr "In¹taluje sa %s\n" -#: lib/rpminstall.c:1073 +#: lib/rpminstall.c:1070 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpminstall.c:1080 -msgid "failed dependencies:\n" -msgstr "nevyrie¹ené závislosti:\n" - #: lib/rpmlead.c:47 #, fuzzy, c-format msgid "read failed: %s (%d)\n" @@ -2723,7 +2719,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Nie je mo¾né otvori» %s pre èítanie: %s." -#: lib/rpmts.c:94 lib/rpmts.c:136 +#: lib/rpmts.c:95 lib/rpmts.c:137 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "nie je mo¾né otvori» %s/packages.rpm\n" @@ -2883,21 +2879,21 @@ msgstr "%s vynechan msgid "excluding directory %s\n" msgstr "vytvára sa adresár %s\n" -#: lib/transaction.c:1081 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:329 +#: lib/verify.c:330 #, fuzzy, c-format msgid "missing %s" msgstr "chýbajúce %s\n" -#: lib/verify.c:424 +#: lib/verify.c:426 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: " -#: lib/verify.c:464 +#: lib/verify.c:466 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3493,6 +3489,9 @@ msgstr "url port mus msgid "failed to create %s: %s\n" msgstr "nepodarilo sa vytvori» %s\n" +#~ msgid "failed dependencies:\n" +#~ msgstr "nevyrie¹ené závislosti:\n" + #, fuzzy #~ msgid "%9s: (%s, %s) added to Depends cache.\n" #~ msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" diff --git a/po/sl.po b/po/sl.po index 03ace9218..4fcbf59fc 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.237 2002/04/13 01:28:52 jbj Exp $ +# $Id: sl.po,v 1.238 2002/04/13 18:52:27 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-12 21:24-0400\n" +"POT-Creation-Date: 2002-04-13 14:47-0400\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -14,53 +14,54 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:39 -msgid "failed build dependencies:\n" +#: build.c:38 +#, fuzzy +msgid "Failed build dependencies:\n" msgstr "izdelava soodvisnosti je bila neuspe¹na:\n" -#: build.c:71 +#: build.c:69 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "Datoteke s specifikacijami %s ni mo¾no odpreti: %s\n" -#: build.c:151 build.c:163 +#: build.c:149 build.c:161 #, fuzzy, c-format msgid "Failed to open tar pipe: %m\n" msgstr "Povezava s programom tar je bila neuspe¹na: %m\n" #. Give up -#: build.c:170 +#: build.c:168 #, fuzzy, c-format msgid "Failed to read spec file from %s\n" msgstr "Neuspe¹no branje datoteke s specifikacijami iz %s" -#: build.c:198 +#: build.c:196 #, fuzzy, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "Preimenovanje %s v %s je bilo neuspe¹no: %m" -#: build.c:238 +#: build.c:236 #, fuzzy, c-format msgid "failed to stat %s: %m\n" msgstr "status %s ni na voljo: %s" -#: build.c:243 +#: build.c:241 #, fuzzy, c-format msgid "File %s is not a regular file.\n" msgstr "Datoteka ni obièajna datoteka: %s\n" -#: build.c:252 +#: build.c:250 #, fuzzy, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "Ne ka¾e, da je %s datoteka s specifikacijami." #. parse up the build operators -#: build.c:307 +#: build.c:305 #, c-format msgid "Building target platforms: %s\n" msgstr "Izgradnja za ciljna strojna okolja: %s\n" -#: build.c:322 +#: build.c:320 #, c-format msgid "Building for target %s\n" msgstr "Izgradnja za ciljni sistem %s\n" @@ -2124,82 +2125,82 @@ msgid "generate signature" msgstr "izdelava podpisa PGP/GPG" #. @observer@ -#: lib/problems.c:226 +#: lib/problems.c:210 msgid "different" msgstr "" -#: lib/problems.c:234 +#: lib/problems.c:218 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "paket %s-%s-%s je za drug tip arhitekture" -#: lib/problems.c:239 +#: lib/problems.c:223 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "paket %s-%s-%s je za drug operacijski sistem" -#: lib/problems.c:244 +#: lib/problems.c:228 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paket %s-%s-%s je ¾e name¹èen" -#: lib/problems.c:249 +#: lib/problems.c:233 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paketa %s ni mo¾no prestaviti\n" -#: lib/problems.c:254 +#: lib/problems.c:238 #, 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:259 +#: lib/problems.c:243 #, 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:264 +#: lib/problems.c:248 #, 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:269 +#: lib/problems.c:253 #, 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:279 +#: lib/problems.c:263 #, 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:284 +#: lib/problems.c:268 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/problems.c:288 +#: lib/problems.c:272 #, 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:292 +#: lib/problems.c:276 #, 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:297 +#: lib/problems.c:281 #, fuzzy, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "neznana napaka %d ob rokovanju s paketom %s-%s-%s" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "conflicts with" msgstr " je v sporu z %s-%s-%s\n" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "is needed by" msgstr " potrebuje %s-%s-%s\n" @@ -2284,7 +2285,7 @@ msgstr "neuspe msgid "%s failed: %s\n" msgstr "%s neuspe¹en" -#: lib/query.c:125 lib/rpmts.c:182 +#: lib/query.c:125 lib/rpmts.c:186 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "napaka v obliki: %s\n" @@ -2329,7 +2330,7 @@ msgid "can't query %s: %s\n" msgstr "ni mo¾no poizvedeti o %s: %s\n" #: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "odpiranje %s je bilo neuspe¹no: %s\n" @@ -2413,7 +2414,7 @@ msgstr " msgid "record %u could not be read\n" msgstr "zapisa %d ni mo¾no prebrati\n" -#: lib/query.c:963 lib/rpminstall.c:678 +#: lib/query.c:963 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "paket %s ni name¹èen\n" @@ -2567,7 +2568,7 @@ msgstr "napaka pri branju iz datoteke %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "datoteka %s zahteva novej¹o razlièico RPM\n" -#: lib/rpminstall.c:486 lib/rpminstall.c:744 +#: lib/rpminstall.c:486 lib/rpminstall.c:743 #, c-format msgid "%s cannot be installed\n" msgstr "%s ni mo¾no namestiti\n" @@ -2577,52 +2578,48 @@ msgstr "%s ni mo msgid "found %d source and %d binary packages\n" msgstr "najdeno %d izvornih in %d binarnih paketov\n" -#: lib/rpminstall.c:540 +#: lib/rpminstall.c:538 lib/rpminstall.c:1076 #, fuzzy msgid "Failed dependencies:\n" msgstr "neuspe¹ne soodvisnosti:\n" -#: lib/rpminstall.c:547 +#: lib/rpminstall.c:545 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:579 +#: lib/rpminstall.c:577 msgid "installing binary packages\n" msgstr "name¹èanje binarnih paketov\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open file %s: %s\n" msgstr "ni mo¾no odpreti datoteke %s: %s\n" -#: lib/rpminstall.c:681 +#: lib/rpminstall.c:678 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" doloèa veè paketov\n" -#: lib/rpminstall.c:705 +#: lib/rpminstall.c:703 msgid "removing these packages would break dependencies:\n" msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n" -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:730 #, c-format msgid "cannot open %s: %s\n" msgstr "ni mo¾no odpreti %s: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:736 #, c-format msgid "Installing %s\n" msgstr "Name¹èanje %s\n" -#: lib/rpminstall.c:1073 +#: lib/rpminstall.c:1070 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpminstall.c:1080 -msgid "failed dependencies:\n" -msgstr "neuspe¹ne soodvisnosti:\n" - #: lib/rpmlead.c:47 #, fuzzy, c-format msgid "read failed: %s (%d)\n" @@ -2723,7 +2720,7 @@ msgstr "Ni mo msgid "Unable to open %s for reading: %s.\n" msgstr "%s ni mo¾no odpreti za branje: %s." -#: lib/rpmts.c:94 lib/rpmts.c:136 +#: lib/rpmts.c:95 lib/rpmts.c:137 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "zbirko podatkov paketov ni mo¾no odpreti v %s\n" @@ -2883,21 +2880,21 @@ msgstr "%s presko msgid "excluding directory %s\n" msgstr "izkljuèevanje imenika %s\n" -#: lib/transaction.c:1081 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "zbiranje seznama priklopljenih datoteènih sistemov.\n" -#: lib/verify.c:329 +#: lib/verify.c:330 #, fuzzy, c-format msgid "missing %s" msgstr "manjka %s\n" -#: lib/verify.c:424 +#: lib/verify.c:426 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: " -#: lib/verify.c:464 +#: lib/verify.c:466 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3500,6 +3497,9 @@ msgstr "vrata URL morajo biti msgid "failed to create %s: %s\n" msgstr "neuspe¹no ustvarjanje %s: %s\n" +#~ msgid "failed dependencies:\n" +#~ msgstr "neuspe¹ne soodvisnosti:\n" + #, fuzzy #~ msgid "%9s: (%s, %s) added to Depends cache.\n" #~ msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n" diff --git a/po/sr.po b/po/sr.po index 612bde8fa..cc5f89dba 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,58 +1,58 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-04-12 21:24-0400\n" +"POT-Creation-Date: 2002-04-13 14:47-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" -#: build.c:39 +#: build.c:38 #, fuzzy -msgid "failed build dependencies:\n" +msgid "Failed build dependencies:\n" msgstr "lo¹e meðuzavisnosti:\n" -#: build.c:71 +#: build.c:69 #, fuzzy, c-format msgid "Unable to open spec file %s: %s\n" msgstr "Ne mogu da otvorim %s za èitanje: %s" -#: build.c:151 build.c:163 +#: build.c:149 build.c:161 #, fuzzy, c-format msgid "Failed to open tar pipe: %m\n" msgstr "neuspelo otvaranje %s\n" #. Give up -#: build.c:170 +#: build.c:168 #, fuzzy, c-format msgid "Failed to read spec file from %s\n" msgstr "Neuspelo èitanje %s: %s." -#: build.c:198 +#: build.c:196 #, fuzzy, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "Neuspelo èitanje %s: %s." -#: build.c:238 +#: build.c:236 #, fuzzy, c-format msgid "failed to stat %s: %m\n" msgstr "neuspelo otvaranje %s: %s" -#: build.c:243 +#: build.c:241 #, fuzzy, c-format msgid "File %s is not a regular file.\n" msgstr "%s ne lièi na RPM paket\n" -#: build.c:252 +#: build.c:250 #, fuzzy, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "%s ne lièi na RPM paket\n" #. parse up the build operators -#: build.c:307 +#: build.c:305 #, c-format msgid "Building target platforms: %s\n" msgstr "" -#: build.c:322 +#: build.c:320 #, fuzzy, c-format msgid "Building for target %s\n" msgstr "gre¹ka potrage za paketom %s\n" @@ -2120,81 +2120,81 @@ msgid "generate signature" msgstr "napravi PGP potpis" #. @observer@ -#: lib/problems.c:226 +#: lib/problems.c:210 msgid "different" msgstr "" -#: lib/problems.c:234 +#: lib/problems.c:218 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/problems.c:239 +#: lib/problems.c:223 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/problems.c:244 +#: lib/problems.c:228 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paket %s nije instaliran\n" -#: lib/problems.c:249 +#: lib/problems.c:233 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paket %s nije instaliran\n" -#: lib/problems.c:254 +#: lib/problems.c:238 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/problems.c:259 +#: lib/problems.c:243 #, 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:264 +#: lib/problems.c:248 #, 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:269 +#: lib/problems.c:253 #, c-format msgid "installing package %s needs %ld%cb on the %s filesystem" msgstr "" -#: lib/problems.c:279 +#: lib/problems.c:263 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/problems.c:284 +#: lib/problems.c:268 #, 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:288 +#: lib/problems.c:272 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "paket %s nije naveden u %s" -#: lib/problems.c:292 +#: lib/problems.c:276 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "paket %s nije naveden u %s" -#: lib/problems.c:297 +#: lib/problems.c:281 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "conflicts with" msgstr " se sudara sa %s-%s-%s\n" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "is needed by" msgstr " je potreban paketu %s-%s-%s\n" @@ -2278,7 +2278,7 @@ msgstr "neuspelo otvaranje %s: %s" msgid "%s failed: %s\n" msgstr "PGP omanuo" -#: lib/query.c:125 lib/rpmts.c:182 +#: lib/query.c:125 lib/rpmts.c:186 #, fuzzy, c-format msgid "incorrect format: %s\n" msgstr "gre¹ka u formatu: %s\n" @@ -2324,7 +2324,7 @@ msgid "can't query %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" #: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:887 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "neuspelo otvaranje %s: %s\n" @@ -2408,7 +2408,7 @@ msgstr "pogre msgid "record %u could not be read\n" msgstr "ne mogu da proèitam slog %d\n" -#: lib/query.c:963 lib/rpminstall.c:678 +#: lib/query.c:963 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "paket %s nije instaliran\n" @@ -2561,7 +2561,7 @@ msgstr "gre msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:486 lib/rpminstall.c:744 +#: lib/rpminstall.c:486 lib/rpminstall.c:743 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "gre¹ka: %s se ne mo¾e instalirati\n" @@ -2571,53 +2571,49 @@ msgstr "gre msgid "found %d source and %d binary packages\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/rpminstall.c:540 +#: lib/rpminstall.c:538 lib/rpminstall.c:1076 #, fuzzy msgid "Failed dependencies:\n" msgstr "lo¹e meðuzavisnosti:\n" -#: lib/rpminstall.c:547 +#: lib/rpminstall.c:545 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:579 +#: lib/rpminstall.c:577 #, fuzzy msgid "installing binary packages\n" msgstr "instaliraj paket" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:599 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/rpminstall.c:681 +#: lib/rpminstall.c:678 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" odreðuje vi¹e paketa\n" -#: lib/rpminstall.c:705 +#: lib/rpminstall.c:703 msgid "removing these packages would break dependencies:\n" msgstr "uklanjanje oviha paketa æe naru¹iti zavisnosti:\n" -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:730 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:736 #, c-format msgid "Installing %s\n" msgstr "Instaliram %s\n" -#: lib/rpminstall.c:1073 +#: lib/rpminstall.c:1070 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "neodstaje paket za deinstalaciju" -#: lib/rpminstall.c:1080 -msgid "failed dependencies:\n" -msgstr "lo¹e meðuzavisnosti:\n" - #: lib/rpmlead.c:47 #, fuzzy, c-format msgid "read failed: %s (%d)\n" @@ -2718,7 +2714,7 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Ne mogu da otvorim %s za èitanje: %s" -#: lib/rpmts.c:94 lib/rpmts.c:136 +#: lib/rpmts.c:95 lib/rpmts.c:137 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" @@ -2879,21 +2875,21 @@ msgstr "" msgid "excluding directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/transaction.c:1081 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "" -#: lib/verify.c:329 +#: lib/verify.c:330 #, fuzzy, c-format msgid "missing %s" msgstr "nedostaje { posle %" -#: lib/verify.c:424 +#: lib/verify.c:426 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Nezadovoljene meðuzavisnosti za %s-%s-%s: " -#: lib/verify.c:464 +#: lib/verify.c:466 #, c-format msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" @@ -3493,6 +3489,9 @@ msgstr "gre msgid "failed to create %s: %s\n" msgstr "neuspelo kreiranje %s\n" +#~ msgid "failed dependencies:\n" +#~ msgstr "lo¹e meðuzavisnosti:\n" + #, fuzzy #~ msgid "%9s: (%s, %s) added to Depends cache.\n" #~ msgstr "datoteka %s ne pripada nijednom paketu\n" diff --git a/po/sv.po b/po/sv.po index cc5e7379d..7026e3963 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: 2002-04-12 21:24-0400\n" +"POT-Creation-Date: 2002-04-13 14:47-0400\n" "PO-Revision-Date: 2001-09-12 14:18+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -9,53 +9,54 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: build.c:39 -msgid "failed build dependencies:\n" +#: build.c:38 +#, fuzzy +msgid "Failed build dependencies:\n" msgstr "ouppfyllda byggberoenden:\n" -#: build.c:71 +#: build.c:69 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "Kan inte öppna specfilen %s: %s\n" -#: build.c:151 build.c:163 +#: build.c:149 build.c:161 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "Kunde inte öppna \"tar\"-rör: %m\n" #. Give up -#: build.c:170 +#: build.c:168 #, c-format msgid "Failed to read spec file from %s\n" msgstr "Kunde inte läsa specfil från %s\n" -#: build.c:198 +#: build.c:196 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "Kunde inte byta namn på %s till %s: %m\n" -#: build.c:238 +#: build.c:236 #, c-format msgid "failed to stat %s: %m\n" msgstr "kunde inte ta status på %s: %m\n" -#: build.c:243 +#: build.c:241 #, c-format msgid "File %s is not a regular file.\n" msgstr "Filen %s är inte en vanlig fil.\n" -#: build.c:252 +#: build.c:250 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "Filen %s tycks inte vara en specfil.\n" #. parse up the build operators -#: build.c:307 +#: build.c:305 #, c-format msgid "Building target platforms: %s\n" msgstr "Bygger målplattformar: %s\n" -#: build.c:322 +#: build.c:320 #, c-format msgid "Building for target %s\n" msgstr "Bygger för målet %s\n" @@ -2063,81 +2064,81 @@ msgid "generate signature" msgstr "generera signatur" #. @observer@ -#: lib/problems.c:226 +#: lib/problems.c:210 msgid "different" msgstr "" -#: lib/problems.c:234 +#: lib/problems.c:218 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "paket %s är för en annan arkitektur" -#: lib/problems.c:239 +#: lib/problems.c:223 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "paket %s är för ett annat operativsystem" -#: lib/problems.c:244 +#: lib/problems.c:228 #, c-format msgid "package %s is already installed" msgstr "paket %s är redan installerat" -#: lib/problems.c:249 +#: lib/problems.c:233 #, 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:254 +#: lib/problems.c:238 #, 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:259 +#: lib/problems.c:243 #, 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:264 +#: lib/problems.c:248 #, 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:269 +#: lib/problems.c:253 #, 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:279 +#: lib/problems.c:263 #, 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:284 +#: lib/problems.c:268 #, 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:288 +#: lib/problems.c:272 #, fuzzy, c-format msgid "package %s has unsatisfied Requires: %s\n" msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n" -#: lib/problems.c:292 +#: lib/problems.c:276 #, fuzzy, c-format msgid "package %s has unsatisfied Conflicts: %s\n" msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n" -#: lib/problems.c:297 +#: lib/problems.c:281 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "okänt fel %d uppträdde under behandling av paket %s" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "conflicts with" msgstr " står i konflikt med %s-%s-%s\n" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "is needed by" msgstr " behövs av %s-%s-%s\n" @@ -2221,7 +2222,7 @@ msgstr "%s misslyckades p msgid "%s failed: %s\n" msgstr "%s misslyckades: %s\n" -#: lib/query.c:125 lib/rpmts.c:182 +#: lib/query.c:125 lib/rpmts.c:186 #, c-format msgid "incorrect format: %s\n" msgstr "fel format: %s\n" @@ -2265,7 +2266,7 @@ msgid "can't query %s: %s\n" msgstr "kan inte fråga %s: %s\n" #: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "misslyckades med att öppna %s: %s\n" @@ -2348,7 +2349,7 @@ msgstr "paketpost nummer: %u\n" msgid "record %u could not be read\n" msgstr "post %u kunde inte läsas\n" -#: lib/query.c:963 lib/rpminstall.c:678 +#: lib/query.c:963 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "paket %s är inte installerat\n" @@ -2500,7 +2501,7 @@ msgstr "fel vid l msgid "file %s requires a newer version of RPM\n" msgstr "filen %s behöver en nyare version av RPM\n" -#: lib/rpminstall.c:486 lib/rpminstall.c:744 +#: lib/rpminstall.c:486 lib/rpminstall.c:743 #, c-format msgid "%s cannot be installed\n" msgstr "%s kan inte installeras\n" @@ -2510,52 +2511,48 @@ msgstr "%s kan inte installeras\n" msgid "found %d source and %d binary packages\n" msgstr "hittade %d käll- och %d binärpaket\n" -#: lib/rpminstall.c:540 +#: lib/rpminstall.c:538 lib/rpminstall.c:1076 #, fuzzy msgid "Failed dependencies:\n" msgstr "ouppfyllda beroenden:\n" -#: lib/rpminstall.c:547 +#: lib/rpminstall.c:545 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:579 +#: lib/rpminstall.c:577 msgid "installing binary packages\n" msgstr "installerar binärpaket\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open file %s: %s\n" msgstr "kan inte öppna filen %s: %s\n" -#: lib/rpminstall.c:681 +#: lib/rpminstall.c:678 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" anger flera paket\n" -#: lib/rpminstall.c:705 +#: lib/rpminstall.c:703 msgid "removing these packages would break dependencies:\n" msgstr "att ta bort dessa paket skulle göra sönder beroenden:\n" -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:730 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:736 #, c-format msgid "Installing %s\n" msgstr "Installerar %s\n" -#: lib/rpminstall.c:1073 +#: lib/rpminstall.c:1070 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpminstall.c:1080 -msgid "failed dependencies:\n" -msgstr "ouppfyllda beroenden:\n" - #: lib/rpmlead.c:47 #, c-format msgid "read failed: %s (%d)\n" @@ -2656,7 +2653,7 @@ msgstr "Kan inte l msgid "Unable to open %s for reading: %s.\n" msgstr "Kan inte öppna %s för läsning: %s.\n" -#: lib/rpmts.c:94 lib/rpmts.c:136 +#: lib/rpmts.c:95 lib/rpmts.c:137 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kan inte öppna paketdatabas i %s\n" @@ -2812,21 +2809,21 @@ msgstr "%s msgid "excluding directory %s\n" msgstr "hoppar över katalogen %s\n" -#: lib/transaction.c:1081 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "hämtar lista över monterade filsystem\n" -#: lib/verify.c:329 +#: lib/verify.c:330 #, c-format msgid "missing %s" msgstr "saknas %s" -#: lib/verify.c:424 +#: lib/verify.c:426 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "Ouppfyllda beroenden för %s-%s-%s: " -#: lib/verify.c:464 +#: lib/verify.c:466 #, 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" @@ -3417,6 +3414,9 @@ msgstr "url-port m msgid "failed to create %s: %s\n" msgstr "kunde inte skapa %s: %s\n" +#~ msgid "failed dependencies:\n" +#~ msgstr "ouppfyllda beroenden:\n" + #, fuzzy #~ msgid "%9s: (%s, %s) added to Depends cache.\n" #~ msgstr "%s: (%s, %s) tillagt till beroendecachen.\n" diff --git a/po/tr.po b/po/tr.po index 02d095cb5..b9b46af86 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: 2002-04-12 21:24-0400\n" +"POT-Creation-Date: 2002-04-13 14:47-0400\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -10,53 +10,54 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 0.9.2alpha\n" -#: build.c:39 -msgid "failed build dependencies:\n" +#: build.c:38 +#, fuzzy +msgid "Failed build dependencies:\n" msgstr "iþlem durdu, önce baðýmlý paketler kurulmalý:\n" -#: build.c:71 +#: build.c:69 #, c-format msgid "Unable to open spec file %s: %s\n" msgstr "%s spec dosyasý açýlamadý: %s\n" -#: build.c:151 build.c:163 +#: build.c:149 build.c:161 #, c-format msgid "Failed to open tar pipe: %m\n" msgstr "tar veriyolu açýlamadý: %m\n" #. Give up -#: build.c:170 +#: build.c:168 #, c-format msgid "Failed to read spec file from %s\n" msgstr "%s paketinden spec dosyasý okunamadý\n" -#: build.c:198 +#: build.c:196 #, c-format msgid "Failed to rename %s to %s: %m\n" msgstr "%s %s olarak deðiþtirilemedi: %m\n" -#: build.c:238 +#: build.c:236 #, c-format msgid "failed to stat %s: %m\n" msgstr "%s durum bilgileri alýnamadý: %m\n" -#: build.c:243 +#: build.c:241 #, c-format msgid "File %s is not a regular file.\n" msgstr "%s bir normal bir dosya deðil.\n" -#: build.c:252 +#: build.c:250 #, c-format msgid "File %s does not appear to be a specfile.\n" msgstr "%s bir spec dosyasý gibi görünmüyor.\n" #. parse up the build operators -#: build.c:307 +#: build.c:305 #, c-format msgid "Building target platforms: %s\n" msgstr "Hedef platformlar derleniyor: %s\n" -#: build.c:322 +#: build.c:320 #, c-format msgid "Building for target %s\n" msgstr "%s için derleniyor\n" @@ -2087,81 +2088,81 @@ msgid "generate signature" msgstr "imza üretir" #. @observer@ -#: lib/problems.c:226 +#: lib/problems.c:210 msgid "different" msgstr "" -#: lib/problems.c:234 +#: lib/problems.c:218 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "%s farklý bir mimari için" -#: lib/problems.c:239 +#: lib/problems.c:223 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "%s farklý bir iþletim sistemi için" -#: lib/problems.c:244 +#: lib/problems.c:228 #, c-format msgid "package %s is already installed" msgstr "%s zaten kurulu" -#: lib/problems.c:249 +#: lib/problems.c:233 #, c-format msgid "path %s in package %s is not relocateable" msgstr "%s dosya yolu %s paketinde yeniden konumlandýrýlamaz" -#: lib/problems.c:254 +#: lib/problems.c:238 #, 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:259 +#: lib/problems.c:243 #, 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:264 +#: lib/problems.c:248 #, 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:269 +#: lib/problems.c:253 #, 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:279 +#: lib/problems.c:263 #, 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:284 +#: lib/problems.c:268 #, 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:288 +#: lib/problems.c:272 #, 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:292 +#: lib/problems.c:276 #, 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:297 +#: lib/problems.c:281 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "anlaþýlamayan %d hatasý, %s paketi iþlenirken saptandý" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "conflicts with" msgstr " %s-%s-%s ile çeliþiyor\n" -#: lib/problems.c:377 +#: lib/problems.c:362 #, fuzzy msgid "is needed by" msgstr " %s-%s-%s için gerekli\n" @@ -2244,7 +2245,7 @@ msgstr "%s a msgid "%s failed: %s\n" msgstr "%s baþarýsýz\n" -#: lib/query.c:125 lib/rpmts.c:182 +#: lib/query.c:125 lib/rpmts.c:186 #, c-format msgid "incorrect format: %s\n" msgstr "biçem yanlýþ: %s\n" @@ -2288,7 +2289,7 @@ msgid "can't query %s: %s\n" msgstr "%s sorgulanamýyor: %s\n" #: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:352 lib/rpminstall.c:494 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:887 #, c-format msgid "open of %s failed: %s\n" msgstr "%s açýlamadý: %s\n" @@ -2371,7 +2372,7 @@ msgstr "paket kay msgid "record %u could not be read\n" msgstr "%u. kayýt okunamadý\n" -#: lib/query.c:963 lib/rpminstall.c:678 +#: lib/query.c:963 lib/rpminstall.c:675 #, c-format msgid "package %s is not installed\n" msgstr "%s paketi kurulu deðil\n" @@ -2523,7 +2524,7 @@ msgstr "%s dosyas 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:486 lib/rpminstall.c:744 +#: lib/rpminstall.c:486 lib/rpminstall.c:743 #, c-format msgid "%s cannot be installed\n" msgstr "%s yüklenemedi\n" @@ -2533,52 +2534,48 @@ msgstr "%s y msgid "found %d source and %d binary packages\n" msgstr "%d kaynak ve %d icra edilebilir paketi bulundu\n" -#: lib/rpminstall.c:540 +#: lib/rpminstall.c:538 lib/rpminstall.c:1076 #, fuzzy msgid "Failed dependencies:\n" msgstr "baðýmlýlýklarda hata; gerekli paketler:\n" -#: lib/rpminstall.c:547 +#: lib/rpminstall.c:545 msgid " Suggested resolutions:\n" msgstr "" -#: lib/rpminstall.c:579 +#: lib/rpminstall.c:577 msgid "installing binary packages\n" msgstr "icra edilebilir paketleri kuruluyor\n" -#: lib/rpminstall.c:600 +#: lib/rpminstall.c:599 #, c-format msgid "cannot open file %s: %s\n" msgstr "%s dosyasý açýlamadý: %s\n" -#: lib/rpminstall.c:681 +#: lib/rpminstall.c:678 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" birden fazla paketi tanýmlýyor\n" -#: lib/rpminstall.c:705 +#: lib/rpminstall.c:703 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:731 +#: lib/rpminstall.c:730 #, c-format msgid "cannot open %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:736 #, c-format msgid "Installing %s\n" msgstr "%s kuruluyor\n" -#: lib/rpminstall.c:1073 +#: lib/rpminstall.c:1070 #, c-format msgid "rollback %d packages to %s" msgstr "" -#: lib/rpminstall.c:1080 -msgid "failed dependencies:\n" -msgstr "baðýmlýlýklarda hata; gerekli paketler:\n" - #: lib/rpmlead.c:47 #, c-format msgid "read failed: %s (%d)\n" @@ -2679,7 +2676,7 @@ msgstr "%s okunam msgid "Unable to open %s for reading: %s.\n" msgstr "%s okuma eriþimi için açýlamadý: %s.\n" -#: lib/rpmts.c:94 lib/rpmts.c:136 +#: lib/rpmts.c:95 lib/rpmts.c:137 #, c-format msgid "cannot open Packages database in %s\n" msgstr "%s de Paket veritabaný açýlamadý\n" @@ -2833,21 +2830,21 @@ msgstr "missingok flamas msgid "excluding directory %s\n" msgstr "%s dizini dýþlanýyor\n" -#: lib/transaction.c:1081 +#: lib/transaction.c:1080 msgid "getting list of mounted filesystems\n" msgstr "baðlý dosya sistemlerinin listesi alýnýyor\n" -#: lib/verify.c:329 +#: lib/verify.c:330 #, c-format msgid "missing %s" msgstr "eksik %s" -#: lib/verify.c:424 +#: lib/verify.c:426 #, fuzzy, c-format msgid "Unsatisifed dependencies for %s: " msgstr "%s-%s-%s için tatmin edici olmayan baðýmlýlýklar: " -#: lib/verify.c:464 +#: lib/verify.c:466 #, 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" @@ -3441,6 +3438,9 @@ msgstr "url portu bir say msgid "failed to create %s: %s\n" msgstr "%s oluþturulamadý: %s\n" +#~ msgid "failed dependencies:\n" +#~ msgstr "baðýmlýlýklarda hata; gerekli paketler:\n" + #, fuzzy #~ msgid "%9s: (%s, %s) added to Depends cache.\n" #~ msgstr "%s: (%s, %s) Baðýmlýlar alanýna eklendi.\n" diff --git a/python/rpmmodule.c b/python/rpmmodule.c index 0ad01fdbe..ccb3f9de7 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -232,20 +232,21 @@ static PyObject * rpmtransRemove(rpmtransObject * s, PyObject * args) { /** \ingroup python */ static PyObject * rpmtransDepCheck(rpmtransObject * s, PyObject * args) { - rpmProblem conflicts, c; - int numConflicts; + rpmProblemSet ps; + rpmProblem p; PyObject * list, * cf; int i; int allSuggestions = 0; if (!PyArg_ParseTuple(args, "|i", &allSuggestions)) return NULL; - rpmdepCheck(s->ts, &conflicts, &numConflicts); - if (numConflicts) { + rpmdepCheck(s->ts); + ps = rpmtsGetProblems(s->ts); + if (ps) { list = PyList_New(0); /* XXX TODO: rpmlib >= 4.0.3 can return multiple suggested keys. */ - for (i = 0; i < numConflicts; i++) { + for (i = 0; i < ps->numProblems; i++) { #ifdef DYING cf = Py_BuildValue("((sss)(ss)iOi)", conflicts[i].byName, conflicts[i].byVersion, conflicts[i].byRelease, @@ -263,17 +264,17 @@ static PyObject * rpmtransDepCheck(rpmtransObject * s, PyObject * args) { int needsFlags, sense; fnpyKey key; - c = conflicts + i; + p = ps->probs + i; - byName = c->pkgNEVR; + byName = p->pkgNEVR; if ((byRelease = strrchr(byName, '-')) != NULL) *byRelease++ = '\0'; if ((byVersion = strrchr(byName, '-')) != NULL) *byVersion++ = '\0'; - key = c->key; + key = p->key; - needsName = c->altNEVR; + needsName = p->altNEVR; if (needsName[1] == ' ') { sense = (needsName[0] == 'C') ? RPMDEP_SENSE_CONFLICTS : RPMDEP_SENSE_REQUIRES; @@ -301,7 +302,7 @@ static PyObject * rpmtransDepCheck(rpmtransObject * s, PyObject * args) { Py_DECREF(cf); } - conflicts = rpmdepFreeConflicts(conflicts, numConflicts); + ps = rpmProblemSetFree(ps); return list; } @@ -408,11 +409,12 @@ static void * tsCallback(const void * hd, const rpmCallbackType what, /** \ingroup python */ -static PyObject * rpmtransRun(rpmtransObject * s, PyObject * args) { +static PyObject * rpmtransRun(rpmtransObject * s, PyObject * args) +{ int flags, ignoreSet; int rc, i; - PyObject * list, * prob; - rpmProblemSet probs; + PyObject * list; + rpmProblemSet ps; struct tsCallbackType cbInfo; if (!PyArg_ParseTuple(args, "iiOO", &flags, &ignoreSet, &cbInfo.cb, @@ -424,11 +426,11 @@ static PyObject * rpmtransRun(rpmtransObject * s, PyObject * args) { (void) rpmtsSetNotifyCallback(s->ts, tsCallback, (void *) &cbInfo); (void) rpmtsSetFlags(s->ts, flags); - rc = rpmRunTransactions(s->ts, NULL, &probs, ignoreSet); + rc = rpmRunTransactions(s->ts, NULL, ignoreSet); + ps = rpmtsGetProblems(s->ts); if (cbInfo.pythonError) { - if (rc > 0) - rpmProblemSetFree(probs); + ps = rpmProblemSetFree(ps); return NULL; } @@ -441,17 +443,17 @@ static PyObject * rpmtransRun(rpmtransObject * s, PyObject * args) { } list = PyList_New(0); - for (i = 0; i < probs->numProblems; i++) { - rpmProblem myprob = probs->probs + i; - prob = Py_BuildValue("s(isN)", rpmProblemString(myprob), - myprob->type, - myprob->str1, - PyLong_FromLongLong(myprob->ulong1)); + for (i = 0; i < ps->numProblems; i++) { + rpmProblem p = ps->probs + i; + PyObject * prob = Py_BuildValue("s(isN)", rpmProblemString(p), + p->type, + p->str1, + PyLong_FromLongLong(p->ulong1)); PyList_Append(list, prob); Py_DECREF(prob); } - rpmProblemSetFree(probs); + ps = rpmProblemSetFree(ps); return list; } diff --git a/rpm.spec b/rpm.spec index ad07a38ca..47380aac6 100644 --- a/rpm.spec +++ b/rpm.spec @@ -521,6 +521,9 @@ fi %{__prefix}/include/popt.h %changelog +* Sat Apr 13 2002 Jeff Johnson 4.1-0.07 +- merge conflicts into problems, handle as transaction set variable. + * Fri Apr 12 2002 Jeff Johnson 4.1-0.06 - use rpmdb-redhat to suggest dependency resolution(s). diff --git a/rpm.spec.in b/rpm.spec.in index 4e6f67682..e23c2387e 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -521,6 +521,9 @@ fi %{__prefix}/include/popt.h %changelog +* Sat Apr 13 2002 Jeff Johnson 4.1-0.07 +- merge conflicts into problems, handle as transaction set variable. + * Fri Apr 12 2002 Jeff Johnson 4.1-0.06 - use rpmdb-redhat to suggest dependency resolution(s). diff --git a/rpmdb/.lclintrc b/rpmdb/.lclintrc index 06d40a37f..a161a849c 100644 --- a/rpmdb/.lclintrc +++ b/rpmdb/.lclintrc @@ -11,7 +11,7 @@ -unrecogcomments # XXX ignore doxygen markings +strict # lclint level --includenest 16 # getting deep, sigh +#-includenest 16 # getting deep, sigh # --- +partial artifacts -declundef diff --git a/rpmio/ugid.c b/rpmio/ugid.c index d55524bc9..4126f4268 100644 --- a/rpmio/ugid.c +++ b/rpmio/ugid.c @@ -32,7 +32,8 @@ int unameToUid(const char * thisUname, uid_t * uid) thisUnameLen = strlen(thisUname); if (lastUname == NULL || thisUnameLen != lastUnameLen || - strcmp(thisUname, lastUname) != 0) { + strcmp(thisUname, lastUname) != 0) + { if (lastUnameAlloced < thisUnameLen + 1) { lastUnameAlloced = thisUnameLen + 10; lastUname = xrealloc(lastUname, lastUnameAlloced); /* XXX memory leak */ diff --git a/tools/rpmsort.c b/tools/rpmsort.c index c1aa04f5e..04052f141 100644 --- a/tools/rpmsort.c +++ b/tools/rpmsort.c @@ -209,18 +209,19 @@ restart: if (numFailed) goto exit; if (!noDeps) { - rpmProblem conflicts = NULL; - int numConflicts = 0; + rpmProblemSet ps; - rc = rpmdepCheck(ts, &conflicts, &numConflicts); + rc = rpmdepCheck(ts); - if (conflicts) { - rpmMessage(RPMMESS_ERROR, _("failed dependencies:\n")); - printDepProblems(stderr, conflicts, numConflicts); - conflicts = rpmdepFreeConflicts(conflicts, numConflicts); + ps = rpmtsGetProblems(ts); + if (ps) { + rpmMessage(RPMMESS_ERROR, _("Failed dependencies:\n")); + printDepProblems(stderr, ps); + ps = rpmProblemSetFree(ps); rc = -1; goto exit; } + ps = rpmProblemSetFree(ps); } rc = rpmdepOrder(ts);