From: jbj Date: Fri, 28 Jun 2002 21:54:24 +0000 (+0000) Subject: - disambiguate added/installed dependency failures (#50388). X-Git-Tag: rpm-4.4-release~1106 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d89ce5854d39a9e896759fb96e6e303c67573bb6;p=platform%2Fupstream%2Frpm.git - disambiguate added/installed dependency failures (#50388). CVS patchset: 5532 CVS date: 2002/06/28 21:54:24 --- diff --git a/CHANGES b/CHANGES index ad328c4..c6edf81 100644 --- a/CHANGES +++ b/CHANGES @@ -148,6 +148,7 @@ - fix: multiple relocations (#67596). - add --build/--program-prefix, delete libtoolize, from %configure. - find-lang.sh: make sure that mo pattern matches leading '/' (#67368). + - disambiguate added/installed dependency failures (#50388). 4.0.3 -> 4.0.4: - solaris: translate i86pc to i386 (#57182). diff --git a/build.c b/build.c index 24de97a..04208d5 100644 --- a/build.c +++ b/build.c @@ -38,7 +38,7 @@ static int checkSpec(rpmts ts, Header h) ps = rpmtsProblems(ts); if (rc == 0 && rpmpsNumProblems(ps) > 0) { rpmMessage(RPMMESS_ERROR, _("Failed build dependencies:\n")); - printDepProblems(stderr, ps); + rpmpsPrint(NULL, ps); rc = 1; } ps = rpmpsFree(ps); diff --git a/lib/depends.c b/lib/depends.c index d535d24..51fdc41 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -550,18 +550,19 @@ exit: } /** - * Check header requires/conflicts against against installed+added packages. + * Check added requires/conflicts against against installed+added packages. * @param ts transaction set * @param pkgNEVR package name-version-release * @param requires Requires: dependencies (or NULL) * @param conflicts Conflicts: dependencies (or NULL) * @param depName dependency name to filter (or NULL) * @param multiLib skip multilib colored dependencies? + * @param adding dependency is from added package set? * @return 0 no problems found */ static int checkPackageDeps(rpmts ts, const char * pkgNEVR, /*@null@*/ rpmds requires, /*@null@*/ rpmds conflicts, - /*@null@*/ const char * depName, uint_32 multiLib) + /*@null@*/ const char * depName, uint_32 multiLib, int adding) /*@globals fileSystem @*/ /*@modifies ts, requires, conflicts, fileSystem */ { @@ -603,7 +604,7 @@ static int checkPackageDeps(rpmts ts, const char * pkgNEVR, } /*@=branchstate@*/ - rpmdsProblem(ts->probs, pkgNEVR, requires, suggestedKeys); + rpmdsProblem(ts->probs, pkgNEVR, requires, suggestedKeys, adding); } /*@switchbreak@*/ break; @@ -637,7 +638,7 @@ static int checkPackageDeps(rpmts ts, const char * pkgNEVR, /* 1 == unsatisfied, 0 == satsisfied */ switch (rc) { case 0: /* conflicts exist. */ - rpmdsProblem(ts->probs, pkgNEVR, conflicts, NULL); + rpmdsProblem(ts->probs, pkgNEVR, conflicts, NULL, adding); /*@switchbreak@*/ break; case 1: /* conflicts don't exist. */ /*@switchbreak@*/ break; @@ -658,10 +659,11 @@ static int checkPackageDeps(rpmts ts, const char * pkgNEVR, * @param ts transaction set * @param dep dependency name * @param mi rpm database iterator + * @param adding dependency is from added package set? * @return 0 no problems found */ -static int checkPackageSet(rpmts ts, - const char * dep, /*@only@*/ /*@null@*/ rpmdbMatchIterator mi) +static int checkPackageSet(rpmts ts, const char * dep, + /*@only@*/ /*@null@*/ rpmdbMatchIterator mi, int adding) /*@globals fileSystem @*/ /*@modifies ts, mi, fileSystem @*/ { @@ -679,7 +681,7 @@ static int checkPackageSet(rpmts ts, pkgNEVR = hGetNEVR(h, NULL); requires = rpmdsNew(h, RPMTAG_REQUIRENAME, scareMem); conflicts = rpmdsNew(h, RPMTAG_CONFLICTNAME, scareMem); - rc = checkPackageDeps(ts, pkgNEVR, requires, conflicts, dep, 0); + rc = checkPackageDeps(ts, pkgNEVR, requires, conflicts, dep, 0, adding); conflicts = rpmdsFree(conflicts); requires = rpmdsFree(requires); pkgNEVR = _free(pkgNEVR); @@ -695,7 +697,7 @@ static int checkPackageSet(rpmts ts, } /** - * Erasing: check name/provides/filename dep against requiredby matches. + * Check to-be-erased dependencies against installed requires. * @param ts transaction set * @param dep requires name * @return 0 no problems found @@ -706,11 +708,11 @@ static int checkDependentPackages(rpmts ts, const char * dep) { rpmdbMatchIterator mi; mi = rpmtsInitIterator(ts, RPMTAG_REQUIRENAME, dep, 0); - return checkPackageSet(ts, dep, mi); + return checkPackageSet(ts, dep, mi, 0); } /** - * Adding: check name/provides dep against conflicts matches. + * Check to-be-added dependencies against installed conflicts. * @param ts transaction set * @param dep conflicts name * @return 0 no problems found @@ -724,7 +726,7 @@ static int checkDependentConflicts(rpmts ts, const char * dep) if (rpmtsGetRdb(ts) != NULL) { /* XXX is this necessary? */ rpmdbMatchIterator mi; mi = rpmtsInitIterator(ts, RPMTAG_CONFLICTNAME, dep, 0); - rc = checkPackageSet(ts, dep, mi); + rc = checkPackageSet(ts, dep, mi, 1); } return rc; @@ -1713,7 +1715,7 @@ int rpmtsCheck(rpmts ts) rpmteDS(p, RPMTAG_REQUIRENAME), rpmteDS(p, RPMTAG_CONFLICTNAME), NULL, - rpmteMultiLib(p)); + rpmteMultiLib(p), 1); if (rc) goto exit; diff --git a/lib/rpmds.c b/lib/rpmds.c index 5a90a55..3dcd5c3 100644 --- a/lib/rpmds.c +++ b/lib/rpmds.c @@ -617,8 +617,8 @@ exit: return result; } -void rpmdsProblem(rpmps ps, const char * pkgNEVR, - const rpmds ds, const fnpyKey * suggestedKeys) +void rpmdsProblem(rpmps ps, const char * pkgNEVR, const rpmds ds, + const fnpyKey * suggestedKeys, int adding) { const char * Name = rpmdsN(ds); const char * DNEVR = rpmdsDNEVR(ds); @@ -637,10 +637,14 @@ void rpmdsProblem(rpmps ps, const char * pkgNEVR, rpmMessage(RPMMESS_DEBUG, _("package %s has unsatisfied %s: %s\n"), pkgNEVR, ds->Type, DNEVR+2); - type = (DNEVR[0] == 'C' && DNEVR[1] == ' ') - ? RPMPROB_CONFLICT : RPMPROB_REQUIRES; + switch ((unsigned)DNEVR[0]) { + case 'C': type = RPMPROB_CONFLICT; break; + default: + case 'R': type = RPMPROB_REQUIRES; break; + } + key = (suggestedKeys ? suggestedKeys[0] : NULL); - rpmpsAppend(ps, type, pkgNEVR, key, NULL, NULL, DNEVR, 0); + rpmpsAppend(ps, type, pkgNEVR, key, NULL, NULL, DNEVR, adding); } int rangeMatchesDepFlags (Header h, const rpmds req) diff --git a/lib/rpmds.h b/lib/rpmds.h index ab5573f..391f57b 100644 --- a/lib/rpmds.h +++ b/lib/rpmds.h @@ -246,10 +246,12 @@ int rpmdsCompare(const rpmds A, const rpmds B) * @param ps transaction set problems * @param pkgNEVR package name/epoch/version/release * @param ds dependency set - * @param suggestedKeys + * @param suggestedKeys filename or python object address + * @param adding dependency problem is from added package set? */ void rpmdsProblem(/*@null@*/ rpmps ps, const char * pkgNEVR, const rpmds ds, - /*@only@*/ /*@null@*/ const fnpyKey * suggestedKeys) + /*@only@*/ /*@null@*/ const fnpyKey * suggestedKeys, + int adding) /*@modifies ps @*/; /** diff --git a/lib/rpminstall.c b/lib/rpminstall.c index 43622d7..a2ebd13 100644 --- a/lib/rpminstall.c +++ b/lib/rpminstall.c @@ -543,7 +543,7 @@ restart: ps = rpmtsProblems(ts); if (!stopInstall && rpmpsNumProblems(ps) > 0) { rpmMessage(RPMMESS_ERROR, _("Failed dependencies:\n")); - printDepProblems(stderr, ps); + rpmpsPrint(NULL, ps); eiu->numFailed = eiu->numPkgs; stopInstall = 1; @@ -701,9 +701,8 @@ int rpmErase(rpmts ts, ps = rpmtsProblems(ts); if (!stopUninstall && rpmpsNumProblems(ps) > 0) { - rpmMessage(RPMMESS_ERROR, _("removing these packages would break " - "dependencies:\n")); - printDepProblems(stderr, ps); + rpmMessage(RPMMESS_ERROR, _("Failed dependencies:\n")); + rpmpsPrint(NULL, ps); numFailed += numPackages; stopUninstall = 1; } @@ -712,8 +711,12 @@ int rpmErase(rpmts ts, if (!stopUninstall) { (void) rpmtsSetFlags(ts, (rpmtsFlags(ts) | RPMTRANS_FLAG_REVERSE)); - numFailed += rpmtsRun(ts, NULL, 0); + numPackages = rpmtsRun(ts, NULL, 0); ps = rpmtsProblems(ts); + if (rpmpsNumProblems(ps) > 0) + rpmpsPrint(NULL, ps); + numFailed += numPackages; + stopUninstall = 1; ps = rpmpsFree(ps); } @@ -1073,7 +1076,7 @@ int rpmRollback(rpmts ts, ps = rpmtsProblems(ts); if (rc != 0 && rpmpsNumProblems(ps) > 0) { rpmMessage(RPMMESS_ERROR, _("Failed dependencies:\n")); - printDepProblems(stderr, ps); + rpmpsPrint(NULL, ps); ps = rpmpsFree(ps); goto exit; } diff --git a/lib/rpmlibprov.c b/lib/rpmlibprov.c index fc6e14c..dfd4882 100644 --- a/lib/rpmlibprov.c +++ b/lib/rpmlibprov.c @@ -30,7 +30,7 @@ static struct rpmlibProvides_s rpmlibProvides[] = { N_("PreReq:, Provides:, and Obsoletes: dependencies support versions.") }, { "rpmlib(CompressedFileNames)", "3.0.4-1", (RPMSENSE_RPMLIB|RPMSENSE_EQUAL), - N_("file name(s) are stored as (dirName,baseName,dirIndex) tuple, not as path.")}, + N_("file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path.")}, { "rpmlib(PayloadIsBzip2)", "3.0.5-1", (RPMSENSE_RPMLIB|RPMSENSE_EQUAL), N_("package payload is compressed using bzip2.") }, @@ -57,12 +57,16 @@ void rpmShowRpmlibProvides(FILE * fp) const struct rpmlibProvides_s * rlp; for (rlp = rpmlibProvides; rlp->featureName != NULL; rlp++) { - fprintf(fp, " %s", rlp->featureName); - if (rlp->featureEVR && rlp->featureFlags) - printDepFlags(fp, rlp->featureEVR, rlp->featureFlags); - fprintf(fp, "\n"); - if (rlp->featureDescription) - fprintf(fp, "\t%s\n", rlp->featureDescription); + rpmds pro = rpmdsSingle(RPMTAG_PROVIDENAME, rlp->featureName, + rlp->featureEVR, rlp->featureFlags); + const char * DNEVR = rpmdsDNEVR(pro); + + if (pro != NULL && DNEVR != NULL) { + fprintf(fp, " %s\n", DNEVR+2); + if (rlp->featureDescription) + fprintf(fp, "\t%s\n", rlp->featureDescription); + } + pro = rpmdsFree(pro); } } diff --git a/lib/rpmps.c b/lib/rpmps.c index 51a84dd..2a3898b 100644 --- a/lib/rpmps.c +++ b/lib/rpmps.c @@ -169,24 +169,6 @@ int rpmpsTrim(rpmps ps, rpmps filter) return gotProblems; } -/* XXX FIXME: merge into problems */ -/* XXX used in verify.c rpmlibprov.c */ -void printDepFlags(FILE * fp, const char * version, int flags) -{ - if (flags) - fprintf(fp, " "); - - if (flags & RPMSENSE_LESS) - fprintf(fp, "<"); - if (flags & RPMSENSE_GREATER) - fprintf(fp, ">"); - if (flags & RPMSENSE_EQUAL) - fprintf(fp, "="); - - if (flags) - fprintf(fp, " %s", version); -} - #if !defined(HAVE_VSNPRINTF) /*@-shadow -bufferoverflowhigh @*/ static inline int vsnprintf(/*@out@*/ char * buf, /*@unused@*/ int nb, @@ -213,7 +195,7 @@ const char * rpmProblemString(const rpmProblem prob) /*@observer@*/ const char * pkgNEVR = (prob->pkgNEVR ? prob->pkgNEVR : "?pkgNEVR?"); /*@observer@*/ - const char * altNEVR = (prob->altNEVR ? prob->altNEVR : "?altNEVR?"); + const char * altNEVR = (prob->altNEVR ? prob->altNEVR : "? ?altNEVR?"); /*@observer@*/ const char * str1 = (prob->str1 ? prob->str1 : N_("different")); int nb = strlen(pkgNEVR) + strlen(str1) + strlen(altNEVR) + 100; @@ -277,12 +259,14 @@ const char * rpmProblemString(const rpmProblem prob) pkgNEVR, str1, strerror(prob->ulong1)); break; case RPMPROB_REQUIRES: - rc = snprintf(buf, nb, _("package %s has unsatisfied Requires: %s\n"), - pkgNEVR, altNEVR+2); + rc = snprintf(buf, nb, _("%s is needed by %s%s"), + altNEVR+2, + (prob->ulong1 ? "" : _("(installed) ")), pkgNEVR); break; case RPMPROB_CONFLICT: - rc = snprintf(buf, nb, _("package %s has unsatisfied Conflicts: %s\n"), - pkgNEVR, altNEVR+2); + rc = snprintf(buf, nb, _("%s conflicts with %s%s"), + altNEVR+2, + (prob->ulong1 ? "" : _("(installed) ")), pkgNEVR); break; default: rc = snprintf(buf, nb, @@ -295,30 +279,6 @@ const char * rpmProblemString(const rpmProblem prob) return buf; } -void rpmProblemPrint(FILE *fp, rpmProblem prob) -{ - const char * msg = rpmProblemString(prob); - fprintf(fp, "%s\n", msg); - msg = _free(msg); -} - -void rpmpsPrint(FILE *fp, rpmps ps) -{ - int i; - - if (ps == NULL) - return; - - if (fp == NULL) - fp = stderr; - - for (i = 0; i < ps->numProblems; i++) { - rpmProblem myprob = ps->probs + i; - if (!myprob->ignoreProblem) - rpmProblemPrint(fp, myprob); - } -} - static int sameProblem(const rpmProblem ap, const rpmProblem bp) /*@*/ { @@ -340,20 +300,26 @@ static int sameProblem(const rpmProblem ap, const rpmProblem bp) return 0; } -/* XXX FIXME: merge into rpmpsPrint */ -void printDepProblems(FILE * fp, rpmps ps) +void rpmpsPrint(FILE *fp, rpmps ps) { + const char * msg; int i; - if (ps && ps->probs != NULL) + if (ps == NULL || ps->probs == NULL || ps->numProblems <= 0) + return; + + if (fp == NULL) + fp = stderr; + for (i = 0; i < ps->numProblems; i++) { - const char * pkgNEVR; - const char * altNEVR; rpmProblem p; int j; p = ps->probs + i; + if (p->ignoreProblem) + continue; + /* Filter already displayed problems. */ for (j = 0; j < i; j++) { if (!sameProblem(p, ps->probs + j)) @@ -362,12 +328,9 @@ void printDepProblems(FILE * fp, rpmps ps) if (j < i) continue; - pkgNEVR = (p->pkgNEVR ? p->pkgNEVR : "?pkgNEVR?"); - altNEVR = (p->altNEVR ? p->altNEVR : "? ?altNEVR?"); + msg = rpmProblemString(p); + fprintf(fp, "\t%s\n", msg); + msg = _free(msg); - fprintf(fp, "\t%s %s %s\n", altNEVR+2, - ((altNEVR[0] == 'C' && altNEVR[1] == ' ') - ? _("conflicts with") : _("is needed by")), - pkgNEVR); } } diff --git a/lib/rpmps.h b/lib/rpmps.h index 39c272d..39bef83 100644 --- a/lib/rpmps.h +++ b/lib/rpmps.h @@ -65,21 +65,6 @@ extern "C" { #endif /** - */ -void printDepFlags(FILE *fp, const char *version, int flags) - /*@globals fileSystem @*/ - /*@modifies *fp, fileSystem @*/; - -/** - * Print a problem array. - * @param fp output file - * @param ps dependency problems - */ -void printDepProblems(FILE * fp, /*@null@*/ const rpmps ps) - /*@globals fileSystem @*/ - /*@modifies *fp, fileSystem @*/; - -/** * Return formatted string representation of a problem. * @param prob rpm problem * @return formatted string (malloc'd) @@ -152,28 +137,23 @@ rpmps rpmpsFree(/*@killref@*/ /*@only@*/ /*@null@*/ rpmps ps) /*@modifies ps @*/; /** - * Output formatted string representation of a problem to file handle. - * @deprecated API: prob used to be passed by value, now passed by reference. - * @param fp file handle - * @param prob rpm problem - */ -/*@-exportlocal@*/ -void rpmProblemPrint(FILE *fp, rpmProblem prob) - /*@globals fileSystem @*/ - /*@modifies prob, *fp, fileSystem @*/; -/*@=exportlocal@*/ - -/** * Print problems to file handle. - * @param fp file handle + * @param fp file handle (NULL uses stderr) * @param ps problem set */ -void rpmpsPrint(FILE *fp, /*@null@*/ rpmps ps) +void rpmpsPrint(/*@null@*/ FILE *fp, /*@null@*/ rpmps ps) /*@globals fileSystem @*/ /*@modifies *fp, ps, fileSystem @*/; /** * Append a problem to set. + * @param ps problem set + * @param type type of problem + * @param pkgNEVR package name + * @param key filename or python object address + * @param dn directory name + * @param bn file base name + * @param ulong1 generic pointer/long attribute */ void rpmpsAppend(/*@null@*/ rpmps ps, rpmProblemType type, /*@null@*/ const char * pkgNEVR, diff --git a/po/cs.po b/po/cs.po index 6405f79..fc21b10 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-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -1468,23 +1468,23 @@ msgstr "%s: %-45s ANO (db poskytuje)\n" msgid "(db package)" msgstr "¾ádné balíèky\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "========== ukládání tsort relací\n" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1492,20 +1492,20 @@ msgid "" msgstr "" "========== tsorting balíèkù (poøadí, #pøedchùdce, #následovník, hloubka)\n" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "SMYÈKA:\n" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "========== pokraèuje tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2194,7 +2194,7 @@ msgid "can't query %s: %s\n" msgstr "nemohu provést dotaz %s: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "otevøení %s selhalo: %s\n" @@ -2446,7 +2446,7 @@ msgstr "chyba p msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "neinstalován " @@ -2456,7 +2456,7 @@ msgstr "neinstalov msgid "found %d source and %d binary packages\n" msgstr "vytvoøení zdrojového a binárního balíèku z " -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "chybné závislosti pøi sestavování:\n" @@ -2480,22 +2480,17 @@ msgstr "nemohu vytvo msgid "\"%s\" specifies multiple packages\n" msgstr "Polo¾ka %s musí být v balíèku pøítomna: %s\n" -#: lib/rpminstall.c:704 -#, fuzzy -msgid "removing these packages would break dependencies:\n" -msgstr "dotaz/ovìøení balíèkù vy¾adujících závislost" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nemohu vytvoøit %s: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, fuzzy, c-format msgid "Installing %s\n" msgstr "øádek: %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2506,85 +2501,80 @@ msgid "read failed: %s (%d)\n" msgstr "%s: Fread selhalo: %s\n" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "balíèek %s je pro jinou architekturu" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, 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/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "balíèek %s je ji¾ nainstalován" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "cesta %s v balíèku %s není pøemístitelná" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, 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/rpmps.c:251 +#: lib/rpmps.c:233 #, 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/rpmps.c:256 +#: lib/rpmps.c:238 #, 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/rpmps.c:261 +#: lib/rpmps.c:243 #, fuzzy, 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/rpmps.c:271 +#: lib/rpmps.c:253 #, 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/rpmps.c:276 +#: lib/rpmps.c:258 #, 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/rpmps.c:280 +#: lib/rpmps.c:262 #, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n" +msgid "%s is needed by %s%s" +msgstr " je nutné pro %s-%s-%s\n" -#: lib/rpmps.c:284 +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "neinstalován " + +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "balíèek %s koliduje: %s\n" +msgid "%s conflicts with %s%s" +msgstr " koliduje s %s-%s-%s\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, 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/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " koliduje s %s-%s-%s\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " je nutné pro %s-%s-%s\n" - #: lib/rpmrc.c:201 #, fuzzy, c-format msgid "missing second ':' at %s:%d\n" @@ -3408,6 +3398,18 @@ msgstr " msgid "failed to create %s: %s\n" msgstr "nemohu zjistit stav %s: %s\n" +#, fuzzy +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "dotaz/ovìøení balíèkù vy¾adujících závislost" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "balíèek %s koliduje: %s\n" + #~ msgid "cannot open rpm database in %s\n" #~ msgstr "nemohu otevøít RPM databázi v %s\n" diff --git a/po/da.po b/po/da.po index d9737bc..b99418b 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-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -1469,42 +1469,42 @@ msgstr "%s: %-45s JA (db tilf msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "fjerne %s-%s-%s \"%s\" fra tsort-relationer.\n" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "========== gemmer tsort-relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "LØKKE:\n" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "========== fortsætter tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2210,7 +2210,7 @@ msgid "can't query %s: %s\n" msgstr "kunne ikke forespørge %s: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "åbning af %s mislykkedes %s\n" @@ -2461,7 +2461,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:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "%s kunne ikke installeres\n" @@ -2471,7 +2471,7 @@ 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:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "afhængighedskrav, der ikke kunne imødekommes:\n" @@ -2494,21 +2494,17 @@ msgstr "kunne ikke msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" angiver flere pakker\n" -#: lib/rpminstall.c:704 -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:734 #, c-format msgid "cannot open %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2519,86 +2515,81 @@ msgid "read failed: %s (%d)\n" msgstr "læsning mislykkedes: %s (%d)\n" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "pakken %s hører til en anden arkitektur" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "pakken %s hører til et andet operativsystem" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "pakken %s er allerede installeret" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "sti %s i pakke %s kan ikke omrokeres" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, 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/rpmps.c:251 +#: lib/rpmps.c:233 #, 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/rpmps.c:256 +#: lib/rpmps.c:238 #, 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/rpmps.c:261 +#: lib/rpmps.c:243 #, fuzzy, 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/rpmps.c:271 +#: lib/rpmps.c:253 #, 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/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "pakke %s prætransaktion-systemkald: %s mislykkedes: %s" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" +msgid "%s is needed by %s%s" +msgstr " kræves af %s-%s-%s\n" -#: lib/rpmps.c:284 +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "ej installeret" + +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "pakke %s skaber konflikt: %s\n" +msgid "%s conflicts with %s%s" +msgstr " skaber konflikt med %s-%s-%s\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ukendt fejl %d under arbejdet med pakken %s" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " skaber konflikt med %s-%s-%s\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " kræves af %s-%s-%s\n" - #: lib/rpmrc.c:201 #, c-format msgid "missing second ':' at %s:%d\n" @@ -3414,6 +3405,17 @@ msgstr "url-port skal v msgid "failed to create %s: %s\n" msgstr "kunne ikke oprette %s: %s\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "fjernelse af disse pakker ville bryde afhængighederne:\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "pakke %s skaber konflikt: %s\n" + #~ msgid "cannot open rpm database in %s\n" #~ msgstr "kan ikke åbne rpm-database i %s\n" diff --git a/po/de.po b/po/de.po index 7f454c3..8a74c95 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-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -1601,43 +1601,43 @@ msgstr "" msgid "(db package)" msgstr "Anfrage an alle Pakete" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" # FIXME -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2375,7 +2375,7 @@ msgid "can't query %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" @@ -2631,7 +2631,7 @@ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "Fehler: %s kann nicht installiert werden\n" @@ -2641,7 +2641,7 @@ 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:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n" @@ -2665,22 +2665,17 @@ msgstr "kann Datei %s nicht msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" bezeichnet mehrere Pakete\n" -# oder besser: "... verletzen" ? -#: lib/rpminstall.c:704 -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:734 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "Installiere %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "Es wurden keine Pakete für die Deinstallation angegeben" @@ -2691,89 +2686,84 @@ msgid "read failed: %s (%d)\n" msgstr "lesen fehlgeschlagen: %s (%d)" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, 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/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, fuzzy, c-format msgid "package %s is already installed" msgstr "Paket %s ist nicht installiert\n" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "Paket %s ist nicht installiert\n" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, 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/rpmps.c:256 +#: lib/rpmps.c:238 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, fuzzy, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "Paket %s wird nicht in %s aufgeführt" +msgid "%s is needed by %s%s" +msgstr " wird von %s-%s-%s gebraucht\n" -#: lib/rpmps.c:284 +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "Paket %s ist nicht installiert\n" + +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "Paket %s wird nicht in %s aufgeführt" +msgid "%s conflicts with %s%s" +msgstr " steht im Konflikt mit %s-%s-%s\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " steht im Konflikt mit %s-%s-%s\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " wird von %s-%s-%s gebraucht\n" - #: lib/rpmrc.c:201 #, fuzzy, c-format msgid "missing second ':' at %s:%d\n" @@ -3616,6 +3606,18 @@ msgstr "Fehler: der FTP-Port muss eine Zahl sein\n" msgid "failed to create %s: %s\n" msgstr "anlegen von %s fehlgeschlagen\n" +# oder besser: "... verletzen" ? +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "Paket %s wird nicht in %s aufgeführt" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "Paket %s wird nicht in %s aufgeführt" + #, fuzzy #~ msgid "cannot open rpm database in %s\n" #~ msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" diff --git a/po/en_RN.po b/po/en_RN.po index 5600375..f9150b1 100644 --- a/po/en_RN.po +++ b/po/en_RN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1438,42 +1438,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2137,7 +2137,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2383,7 +2383,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2393,7 +2393,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2415,21 +2415,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2440,81 +2436,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 diff --git a/po/es.po b/po/es.po index 5600375..f9150b1 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1438,42 +1438,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2137,7 +2137,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2383,7 +2383,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2393,7 +2393,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2415,21 +2415,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2440,81 +2436,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 diff --git a/po/eu_ES.po b/po/eu_ES.po index 5600375..f9150b1 100644 --- a/po/eu_ES.po +++ b/po/eu_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1438,42 +1438,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2137,7 +2137,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2383,7 +2383,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2393,7 +2393,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2415,21 +2415,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2440,81 +2436,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 diff --git a/po/fi.po b/po/fi.po index eded373..ebd9d2e 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -1492,42 +1492,42 @@ msgstr "" msgid "(db package)" msgstr "kysele kaikki paketit" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2256,7 +2256,7 @@ msgid "can't query %s: %s\n" msgstr "virhe: en voi avata %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" @@ -2507,7 +2507,7 @@ msgstr "virhe luotaessa hakemistoa %s: %s" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "virhe: %s ei voida asentaa\n" @@ -2517,7 +2517,7 @@ 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:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "puuttuvat riippuvuudet:\n" @@ -2541,21 +2541,17 @@ msgstr "en voinut avata tiedostoa %s: " msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" määrittää useita paketteja\n" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "virhe: en voi avata %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "Asennan: %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "poistolle ei määritelty paketteja" @@ -2566,85 +2562,80 @@ msgid "read failed: %s (%d)\n" msgstr "luku epäonnistui: %s (%d)" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paketti %s ei ole asennettu\n" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paketti %s ei ole asennettu\n" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, 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/rpmps.c:256 +#: lib/rpmps.c:238 #, 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/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, fuzzy, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "paketti %s ei ole %s:ssä" +msgid "%s is needed by %s%s" +msgstr "vaatii %s-%s-%s\n" + +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "paketti %s ei ole asennettu\n" -#: lib/rpmps.c:284 +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "paketti %s ei ole %s:ssä" +msgid "%s conflicts with %s%s" +msgstr " on ristiriidassa %s-%s-%s:n kanssa\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " on ristiriidassa %s-%s-%s:n kanssa\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr "vaatii %s-%s-%s\n" - #: lib/rpmrc.c:201 #, fuzzy, c-format msgid "missing second ':' at %s:%d\n" @@ -3475,6 +3466,17 @@ msgstr "virhe: ftpport pit msgid "failed to create %s: %s\n" msgstr "%s:n luonti epäonnistui\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "paketti %s ei ole %s:ssä" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "paketti %s ei ole %s:ssä" + #, fuzzy #~ msgid "cannot open rpm database in %s\n" #~ msgstr "virhe: en voi avata %s%s/packages.rpm\n" diff --git a/po/fr.po b/po/fr.po index 10df16b..126fcca 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-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1522,42 +1522,42 @@ msgstr "" msgid "(db package)" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "impossible d'ouvrir: %s\n" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2301,7 +2301,7 @@ msgid "can't query %s: %s\n" msgstr "impossible d'ouvrir: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "La construction a chou.\n" @@ -2551,7 +2551,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -2561,7 +2561,7 @@ msgstr "aucun package n'a t spcifi pour l'installation" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "impossible d'ouvrir: %s\n" @@ -2584,21 +2584,17 @@ msgstr "impossible d'ouvrir: %s\n" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "aucun package n'a t spcifi pour la dsinstallation" @@ -2609,83 +2605,80 @@ msgid "read failed: %s (%d)\n" msgstr "impossible d'ouvrir: %s\n" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, fuzzy, c-format msgid "package %s is already installed" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, 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/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 -#, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" +#: lib/rpmps.c:262 +#, c-format +msgid "%s is needed by %s%s" +msgstr "" + +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpmps.c:284 +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +msgid "%s conflicts with %s%s" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/rpmps.c:370 -msgid "conflicts with" -msgstr "" - -#: lib/rpmps.c:370 -msgid "is needed by" -msgstr "" - #: lib/rpmrc.c:201 #, c-format msgid "missing second ':' at %s:%d\n" @@ -3501,6 +3494,14 @@ msgid "failed to create %s: %s\n" msgstr "impossible d'ouvrir: %s\n" #, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "aucun package n'a t spcifi pour l'installation" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "aucun package n'a t spcifi pour la dsinstallation" + +#, fuzzy #~ msgid "cannot open rpm database in %s\n" #~ msgstr "impossible d'ouvrir: %s\n" @@ -3812,10 +3813,6 @@ msgstr "impossible d'ouvrir: %s\n" #~ msgstr "aucun package n'a t spcifi pour l'installation" #, fuzzy -#~ msgid "package %s conflicts: %s\n" -#~ msgstr "aucun package n'a t spcifi pour la dsinstallation" - -#, fuzzy #~ msgid "%s: read manifest failed: %s\n" #~ msgstr "impossible d'ouvrir: %s\n" diff --git a/po/gl.po b/po/gl.po index f7aa7d2..dd3e646 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-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -1433,42 +1433,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2132,7 +2132,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2378,7 +2378,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2388,7 +2388,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2410,21 +2410,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2435,81 +2431,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 diff --git a/po/hu.po b/po/hu.po index 5600375..f9150b1 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1438,42 +1438,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2137,7 +2137,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2383,7 +2383,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2393,7 +2393,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2415,21 +2415,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2440,81 +2436,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 diff --git a/po/id.po b/po/id.po index 5600375..f9150b1 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1438,42 +1438,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2137,7 +2137,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2383,7 +2383,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2393,7 +2393,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2415,21 +2415,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2440,81 +2436,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 diff --git a/po/is.po b/po/is.po index eb7f4d4..8539e32 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-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -1441,42 +1441,42 @@ msgstr "" msgid "(db package)" msgstr "uppfæra pakka" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2151,7 +2151,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2397,7 +2397,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2407,7 +2407,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "gat ekki útbúið pakkaskilyrði:\n" @@ -2430,21 +2430,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2455,81 +2451,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 diff --git a/po/it.po b/po/it.po index 5600375..f9150b1 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1438,42 +1438,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2137,7 +2137,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2383,7 +2383,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2393,7 +2393,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2415,21 +2415,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2440,81 +2436,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 diff --git a/po/ja.po b/po/ja.po index 476a56b..b37ace4 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-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -1517,42 +1517,42 @@ msgstr "%s: %s msgid "(db package)" msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Þ¤·¤¿\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2293,7 +2293,7 @@ msgid "can't query %s: %s\n" msgstr "%s ¤òºï½ü(unlink)¤Ç¤­¤Þ¤»¤ó: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n" @@ -2547,7 +2547,7 @@ msgstr " msgid "file %s requires a newer version of RPM\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¤Ï¤è¤ê¿·¤·¤¤ RPM ¤Î¥Ð¡¼¥¸¥ç¥ó¤¬É¬ÍפǤ¹\n" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó\n" @@ -2557,7 +2557,7 @@ msgstr "%s msgid "found %d source and %d binary packages\n" msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿\n" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "°Í¸À­¤Î·çÇ¡:\n" @@ -2580,21 +2580,17 @@ msgstr " msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¤ÏÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹\n" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë¤È°Í¸À­¤òÇ˲õ¤·¤Þ¤¹:\n" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2605,94 +2601,89 @@ msgid "read failed: %s (%d)\n" msgstr "Æɤ߹þ¤ß¤Î¼ºÇÔ: %s (%d)" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¸þ¤±¤Ç¤¹" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë OS ¸þ¤±¤Ç¤¹" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, fuzzy, c-format msgid "package %s is already installed" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Þ¤»¤ó" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, fuzzy, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" "¥Õ¥¡¥¤¥ë %s ¤Ï %s-%s-%s ¤È %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Î¥Õ¥¡¥¤¥ë¤È¶¥¹ç¤·¤Æ¤¤¤Þ¤¹" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, 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/rpmps.c:256 +#: lib/rpmps.c:238 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s (%s-%s-%s¤è¤ê¤â¿·¤·¤¤¤â¤Î) ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ" "¤¹" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, fuzzy, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å" "¤Ç)" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, fuzzy, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å" "¤Ç)" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n" +msgid "%s is needed by %s%s" +msgstr "¤Ï %s-%s-%s ¤ËɬÍפȤµ¤ì¤Æ¤¤¤Þ¤¹\n" -#: lib/rpmps.c:284 +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" + +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹: %s\n" +msgid "%s conflicts with %s%s" +msgstr " %s-%s-%s ¤È¶¥¹ç¤·¤Þ¤¹\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, fuzzy, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼ %d ¤¬¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤ÎÁàºîÃæ¤Ë¤ª¤­¤Þ¤·¤¿" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " %s-%s-%s ¤È¶¥¹ç¤·¤Þ¤¹\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr "¤Ï %s-%s-%s ¤ËɬÍפȤµ¤ì¤Æ¤¤¤Þ¤¹\n" - #: lib/rpmrc.c:201 #, fuzzy, c-format msgid "missing second ':' at %s:%d\n" @@ -3525,6 +3516,17 @@ msgstr "url msgid "failed to create %s: %s\n" msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë¤È°Í¸À­¤òÇ˲õ¤·¤Þ¤¹:\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹: %s\n" + #, fuzzy #~ msgid "cannot open rpm database in %s\n" #~ msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" diff --git a/po/ko.po b/po/ko.po index b9235be..7c54d8b 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.4\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 2002-03-04 17:17+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -1454,23 +1454,23 @@ msgstr "%s: %-45s msgid "(db package)" msgstr "ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "´ÙÀ½°ú °ü·ÃµÈ ÆÐÅ°Áö À̸§À» ¹«½ÃÇÕ´Ï´Ù [%d]\t%s -> %s\n" -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort °ü°è¿¡¼­ %s-%s-%s \"%s\"(À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" @@ -1478,20 +1478,20 @@ msgstr "" "========== ÆÐÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼­, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, Æ®¸®, ±íÀÌ" "[depth])\n" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "========== ÈÄÀÓÀÚ¸¸ [successors only] (Ç¥Çö ¼ø)\n" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "·çÇÁ(LOOP):\n" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2183,7 +2183,7 @@ msgid "can't query %s: %s\n" msgstr "%s(À»)¸¦ ÁúÀÇÇÒ ¼ö ¾øÀ½: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "%s(À»)¸¦ ¿©´Âµ¥ ½ÇÆÐÇÔ: %s\n" @@ -2434,7 +2434,7 @@ msgstr "%s msgid "file %s requires a newer version of RPM\n" msgstr "%s ÆÄÀÏÀº ÃֽŠ¹öÀüÀÇ RPMÀ» ÇÊ¿ä·Î ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "%s(Àº)´Â ¼³Ä¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n" @@ -2444,7 +2444,7 @@ msgstr "%s( msgid "found %d source and %d binary packages\n" msgstr "%dÀÇ ¼Ò½º¿Í %dÀÇ ¹ÙÀ̳ʸ® ÆÐÅ°Áö°¡ °Ë»öµÇ¾ú½À´Ï´Ù\n" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇØ ½ÇÆÐÇÔ:\n" @@ -2467,21 +2467,17 @@ msgstr "%s msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¿©·¯°³ÀÇ ÆÐÅ°Áö¸¦ ÁöÁ¤ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "ÀÌ ÆÐÅ°ÁöµéÀ» Á¦°ÅÇÒ °æ¿ì ÀÇÁ¸¼ºÀÌ ±úÁú ¼ö ÀÖÀ½:\n" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "%s(À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "%s(À»)¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "(+%d,-%d) ÆÐÅ°Áö¸¦ %sÀ¸·Î ·Ñ¹é(rollback)ÇÕ´Ï´Ù" @@ -2492,91 +2488,86 @@ msgid "read failed: %s (%d)\n" msgstr "Àдµ¥ ½ÇÆÐÇÔ: %s (%d)\n" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "%s(Àº)´Â ´Ù¸¥ ¾ÆÅ°ÅØÃĸ¦ À§ÇÑ ÆÐÅ°ÁöÀÔ´Ï´Ù" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "%s(Àº)´Â ´Ù¸¥ ¿î¿µÃ¼Á¦¸¦ À§ÇÑ ÆÐÅ°ÁöÀÔ´Ï´Ù" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "%s ÆÐÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "%2$s ÆÐÅ°Áö ¾ÈÀÇ %1$s °æ·Î´Â Àç¹èÄ¡ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "%2$s(¿Í)°ú %3$sÀÇ ¼³Ä¡ °úÁ¤¿¡¼­ %1$s ÆÄÀÏÀÌ ¼­·Î Ãæµ¹ÇÕ´Ï´Ù" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "%2$s¿¡¼­ ¼³Ä¡µÇ´Â %1$s ÆÄÀÏÀº %3$s ÆÐÅ°ÁöÀÇ ÆÄÀÏ°ú Ãæµ¹ÇÕ´Ï´Ù" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "%s ÆÐÅ°Áö (%s º¸´Ù ÃÖ½ÅÀÇ ÆÐÅ°Áö)´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, fuzzy, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" "%4$s ÆÄÀϽýºÅÛ »ó¿¡¼­ %1$s ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÒ °æ¿ì¿¡´Â %2$ld%3$cb(ÀÌ)°¡ ÇÊ¿äÇÕ" "´Ï´Ù" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" "%3$s ÆÄÀϽýºÅÛ »ó¿¡¼­ %1$s ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÒ °æ¿ì¿¡´Â %2$ldÀÇ ¾ÆÀ̳ëµå(inode)" "°¡ ÇÊ¿äÇÕ´Ï´Ù" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" "%s ÆÐÅ°ÁöÀÇ ¼±(pre)-Æ®·£Àè¼Ç ½Ã½ºÅÛÄÝ(syscall): %s(ÀÌ)°¡ ½ÇÆÐÇß½À´Ï´Ù: %s" -#: lib/rpmps.c:280 -#, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä»çÇ×(³»¿ª)ÀÌ ¸¸Á·ÇÏÁö ¾ÊÀ½: %s\n" +#: lib/rpmps.c:262 +#, fuzzy, c-format +msgid "%s is needed by %s%s" +msgstr " (Àº)´Â %s-%s-%s ¿¡¼­ ÇÊ¿ä·Î ÇÕ´Ï´Ù\n" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "%s ÆÐÅ°ÁöÀÇ Ãæµ¹»çÇ×(³»¿ª)ÀÌ ¸¸Á·ÇÏÁö ¾ÊÀ½: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "¼³Ä¡µÇ¾î ÀÖÁö ¾ÊÀ½ " + +#: lib/rpmps.c:267 +#, fuzzy, c-format +msgid "%s conflicts with %s%s" +msgstr " %s-%s-%s (¿Í)°ú Ãæµ¹ÇÕ´Ï´Ù\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" "%2$s ÆÐÅ°Áö¸¦ ó¸®ÇÏ´Â °úÁ¤¿¡¼­ ¾Ë ¼ö ¾ø´Â ¿À·ù %1$d(ÀÌ)°¡ ¹ß»ýÇß½À´Ï´Ù" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " %s-%s-%s (¿Í)°ú Ãæµ¹ÇÕ´Ï´Ù\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " (Àº)´Â %s-%s-%s ¿¡¼­ ÇÊ¿ä·Î ÇÕ´Ï´Ù\n" - #: lib/rpmrc.c:201 #, c-format msgid "missing second ':' at %s:%d\n" @@ -3393,6 +3384,15 @@ msgstr "URL msgid "failed to create %s: %s\n" msgstr "%s(À»)¸¦ »ý¼ºÇϴµ¥ ½ÇÆÐÇÔ: %s\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "ÀÌ ÆÐÅ°ÁöµéÀ» Á¦°ÅÇÒ °æ¿ì ÀÇÁ¸¼ºÀÌ ±úÁú ¼ö ÀÖÀ½:\n" + +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä»çÇ×(³»¿ª)ÀÌ ¸¸Á·ÇÏÁö ¾ÊÀ½: %s\n" + +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "%s ÆÐÅ°ÁöÀÇ Ãæµ¹»çÇ×(³»¿ª)ÀÌ ¸¸Á·ÇÏÁö ¾ÊÀ½: %s\n" + #~ msgid "cannot open rpm database in %s\n" #~ msgstr "%sÀÇ rpm µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n" diff --git a/po/no.po b/po/no.po index af4577f..dc0f0d4 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-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -1456,42 +1456,42 @@ msgstr "" msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2174,7 +2174,7 @@ msgid "can't query %s: %s\n" msgstr "kan ikke spørre på %s: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "feil under åpning av %s: %s\n" @@ -2420,7 +2420,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:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2430,7 +2430,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "fant %d kilde- og %d binærpakker\n" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "feilede avhengigheter:\n" @@ -2453,21 +2453,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" spesifiserer flere pakker\n" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "fjerning av disse pakkene vil ødelegge avhengigheter:\n" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "kan ikke åpne %s: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "Installerer %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2478,85 +2474,80 @@ msgid "read failed: %s (%d)\n" msgstr "lesing feilet: %s (%d)\n" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "pakke %s er for en annen arkitektur" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "pakke %s er for et annet operativsystem" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "pakke %s er allerede installert" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "sti %s i pakke %s kan ikke relokeres" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "pakke %s er i konflikt: %s\n" +msgid "%s is needed by %s%s" +msgstr " kreves av %s-%s-%s\n" + +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "ikke installert" -#: lib/rpmps.c:284 +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "pakke %s er i konflikt: %s\n" +msgid "%s conflicts with %s%s" +msgstr " er i konflikt med %s-%s-%s\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " er i konflikt med %s-%s-%s\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " kreves av %s-%s-%s\n" - #: lib/rpmrc.c:201 #, c-format msgid "missing second ':' at %s:%d\n" @@ -3363,6 +3354,17 @@ msgstr "url-port m msgid "failed to create %s: %s\n" msgstr "kunne ikke opprette %s: %s\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "fjerning av disse pakkene vil ødelegge avhengigheter:\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "pakke %s er i konflikt: %s\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "pakke %s er i konflikt: %s\n" + #~ msgid "cannot open rpm database in %s\n" #~ msgstr "kan ikke åpne database i %s\n" diff --git a/po/pl.po b/po/pl.po index 626e31f..2f952d6 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-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -1499,42 +1499,42 @@ msgstr "Udost msgid "(db package)" msgstr "znaleziono %d pakietów\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "usuwanie indeksu grupy\n" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2256,7 +2256,7 @@ msgid "can't query %s: %s\n" msgstr "nie mo¿na odwi±zaæ %s: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "otwarcie %s nie powiod³o siê\n" @@ -2507,7 +2507,7 @@ msgstr "b msgid "file %s requires a newer version of RPM\n" msgstr "plik %s wymaga nowszej wersji RPM\n" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie mo¿e byæ zainstalowany\n" @@ -2517,7 +2517,7 @@ 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:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "niespe³nione zale¿no¶ci:\n" @@ -2540,21 +2540,17 @@ msgstr "nie mo msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" okre¶la wiele pakietów\n" -#: lib/rpminstall.c:704 -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:734 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie mo¿na otworzyæ %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "Instalacja %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2565,87 +2561,82 @@ msgid "read failed: %s (%d)\n" msgstr "odczyt nie powiód³ siê: %s (%d)" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "pakiet %s-%s-%s zbudowano dla innej architektury" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "pakiet %s-%s-%s zbudowano dla innego systemu operacyjnego" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, fuzzy, c-format msgid "package %s is already installed" msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "pakiet %s nie jest przesuwalny\n" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, 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/rpmps.c:256 +#: lib/rpmps.c:238 #, 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/rpmps.c:261 +#: lib/rpmps.c:243 #, 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/rpmps.c:271 +#: lib/rpmps.c:253 #, 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/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n" +msgid "%s is needed by %s%s" +msgstr " jest wymagany przez %s-%s-%s\n" -#: lib/rpmps.c:284 +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "niezainstalowany" + +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "pakiet %s jest w konflikcie: %s\n" +msgid "%s conflicts with %s%s" +msgstr " jest w konflikcie z %s-%s-%s\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, 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/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " jest w konflikcie z %s-%s-%s\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " jest wymagany przez %s-%s-%s\n" - #: lib/rpmrc.c:201 #, fuzzy, c-format msgid "missing second ':' at %s:%d\n" @@ -3468,6 +3459,17 @@ msgstr "port musi by msgid "failed to create %s: %s\n" msgstr "utworzenie %s nie powiod³o siê\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "usuniêcie tych pakietów zerwie zale¿no¶ci:\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "pakiet %s jest w konflikcie: %s\n" + #, fuzzy #~ msgid "cannot open rpm database in %s\n" #~ msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" diff --git a/po/pt.po b/po/pt.po index 54b823f..715caca 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 2002-02-14 10:51+0000\n" "Last-Translator: José Nuno Coelho Sanarra Pires \n" "Language-Team: pt %s\n" msgstr "ignorar relações entre o nome do pacote [%d]\t%s -> %s\n" -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "a remover o %s-%s-%s \"%s\" das relações do tsort.\n" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "=========== a guardar as relações do tsort\n" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" "========== ordenar pacotes (order, #predecessors, #succesors, tree, depth)\n" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "========== só os sucessores (ordem de apresentação)\n" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "CICLO:\n" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "========== a prosseguir o tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2195,7 +2195,7 @@ msgid "can't query %s: %s\n" msgstr "não consigo pesquisar o %s: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "o acesso ao %s falhou: %s\n" @@ -2446,7 +2446,7 @@ msgstr "erro ao ler do ficheiros %s\n" msgid "file %s requires a newer version of RPM\n" msgstr "o %s precisa duma versão mais recente do RPM\n" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "o %s não pode ser instalado\n" @@ -2456,7 +2456,7 @@ msgstr "o %s n msgid "found %d source and %d binary packages\n" msgstr "encontrados %d pacotes com código-fonte e %d binários\n" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "dependências falhadas:\n" @@ -2479,21 +2479,17 @@ msgstr "n msgid "\"%s\" specifies multiple packages\n" msgstr "o \"%s\" especifica vários pacotes\n" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "a remoção destes pacotes irá quebrar dependências:\n" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "não consigo aceder ao %s: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "A instalar o %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "a efectuar o 'rollback' (+%d,-%d) pacotes para %s" @@ -2504,89 +2500,84 @@ msgid "read failed: %s (%d)\n" msgstr "a leitura falhou: %s (%d)\n" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "o pacote %s é para uma arquitectura diferente" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "o pacote %s é para um sistema operativo diferente" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "o pacote %s já está instalado" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "a directoria %s no pacote %s não pode ser mudada de sítio" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" "o ficheiro %s está em conflito com as tentativas de instalação do %s e %s" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" "o ficheiro %s da instalação do %s está em conflito com o ficheiro do pacote %" "s" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "o pacote %s (que é mais recente que o %s) já está instalado" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, fuzzy, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "a instalação do pacote %s precisa de %ld%cb no sistema de ficheiros %s" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" "a instalação do pacote %s precisa de %ld 'inodes' no sistema de ficheiros %s" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "a(s) chamada(s) de pré-transacção do pacote %s: %s falhou: %s" -#: lib/rpmps.c:280 -#, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "o pacote %s tem requisitos não satisfeitos: %s\n" +#: lib/rpmps.c:262 +#, fuzzy, c-format +msgid "%s is needed by %s%s" +msgstr " é necessário pelo %s-%s-%s\n" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "o pacote %s tem campos Conflits não satisfeitos: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "não instalado " + +#: lib/rpmps.c:267 +#, fuzzy, c-format +msgid "%s conflicts with %s%s" +msgstr " está em conflito com o %s-%s-%s\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "encontrado o erro desconhecido %d ao manipular o pacote %s" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " está em conflito com o %s-%s-%s\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " é necessário pelo %s-%s-%s\n" - #: lib/rpmrc.c:201 #, c-format msgid "missing second ':' at %s:%d\n" @@ -3398,6 +3389,15 @@ msgstr "o porto do URL tem de ser um n msgid "failed to create %s: %s\n" msgstr "não consegui criar o %s: %s\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "a remoção destes pacotes irá quebrar dependências:\n" + +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "o pacote %s tem requisitos não satisfeitos: %s\n" + +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "o pacote %s tem campos Conflits não satisfeitos: %s\n" + #~ msgid "cannot open rpm database in %s\n" #~ msgstr "não consigo a base de dados do RPM em %s\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 3f3bb03..092bc15 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" #: build.c:40 #, fuzzy @@ -1610,43 +1610,43 @@ msgstr "" msgid "(db package)" msgstr "pesquise todos os pacotes" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" # , c-format -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "No consegui abrir: %s\n" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2385,7 +2385,7 @@ msgid "can't query %s: %s\n" msgstr "No consegui abrir: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "Construo falhou.\n" @@ -2651,7 +2651,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "no foi passado pacote para instalao" @@ -2661,7 +2661,7 @@ msgstr "no foi passado pacote para instalao" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "lista dependncias do pacote" @@ -2686,23 +2686,18 @@ msgstr "No consegui abrir: %s\n" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -#, fuzzy -msgid "removing these packages would break dependencies:\n" -msgstr "lista dependncias do pacote" - # , c-format -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "no foi passado pacote para desinstalao" @@ -2714,83 +2709,80 @@ msgid "read failed: %s (%d)\n" msgstr "No consegui abrir: %s\n" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "no foi passado pacote para instalao" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "no foi passado pacote para instalao" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, fuzzy, c-format msgid "package %s is already installed" msgstr "no foi passado pacote para instalao" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "no foi passado pacote para instalao" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "no foi passado pacote para instalao" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 -#, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" +#: lib/rpmps.c:262 +#, c-format +msgid "%s is needed by %s%s" +msgstr "" + +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " msgstr "no foi passado pacote para instalao" -#: lib/rpmps.c:284 +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +msgid "%s conflicts with %s%s" msgstr "no foi passado pacote para desinstalao" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/rpmps.c:370 -msgid "conflicts with" -msgstr "" - -#: lib/rpmps.c:370 -msgid "is needed by" -msgstr "" - #: lib/rpmrc.c:201 #, c-format msgid "missing second ':' at %s:%d\n" @@ -3648,6 +3640,18 @@ msgstr "" msgid "failed to create %s: %s\n" msgstr "No consegui abrir o pipe tar: %s\n" +#, fuzzy +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "lista dependncias do pacote" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "no foi passado pacote para instalao" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "no foi passado pacote para desinstalao" + # , c-format #, fuzzy #~ msgid "cannot open rpm database in %s\n" @@ -4199,10 +4203,6 @@ msgstr "No consegui abrir o pipe tar: %s\n" #~ msgstr "no foi passado pacote para instalao" #, fuzzy -#~ msgid "package %s conflicts: %s\n" -#~ msgstr "no foi passado pacote para desinstalao" - -#, fuzzy #~ msgid "rpm verify mode (legacy)" #~ msgstr "modo pesquisa" diff --git a/po/ro.po b/po/ro.po index 370bc3c..ae9f185 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-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -1433,42 +1433,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2132,7 +2132,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2378,7 +2378,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2388,7 +2388,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2410,21 +2410,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2435,81 +2431,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 diff --git a/po/rpm.pot b/po/rpm.pot index a9ad294..268e867 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-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1439,42 +1439,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2138,7 +2138,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2384,7 +2384,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2394,7 +2394,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2416,21 +2416,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2441,81 +2437,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 diff --git a/po/ru.po b/po/ru.po index 9df5f15..51e4dcb 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-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 2002-04-09 16:44-0400\n" "Last-Translator: Eugene Kanter, \n" "Language-Team: Black Cat Linux Team \n" @@ -1476,23 +1476,23 @@ msgstr "%s: %-45s YES (db provides)\n" msgid "(db package)" msgstr "ÎÅÔ ÐÁËÅÔÏ×\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "========== ÚÁÐÉÓØ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" @@ -1500,20 +1500,20 @@ msgstr "" "========== ÓÏÒÔÉÒÏ×ËÁ ÐÁËÅÔÏ× (ÏÞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, " "ÄÅÒÅ×Ï, ÇÌÕÂÉÎÁ)\n" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "========== ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌÉ (× ÐÏÒÑÄËÅ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ)\n" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "ãéëì:\n" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "========== ÐÒÏÄÏÌÖÅÎÉÅ ÕÐÏÒÑÄÏÞÅÎÉÑ ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2197,7 +2197,7 @@ msgid "can't query %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÒÏÓÉÔØ %s: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" @@ -2447,7 +2447,7 @@ msgstr " msgid "file %s requires a newer version of RPM\n" msgstr "ÄÌÑ ÆÁÊÌÁ %s ÎÅÏÂÈÏÄÉÍÁ ÂÏÌÅÅ ÎÏ×ÁÑ ×ÅÒÓÉÑ RPM\n" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n" @@ -2457,7 +2457,7 @@ msgstr "%s msgid "found %d source and %d binary packages\n" msgstr "ÎÁÊÄÅÎÏ %d ÉÓÈÏÄÎÙÈ É %d ÂÉÎÁÒÎÙÈ ÐÁËÅÔÏ×\n" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" @@ -2480,21 +2480,17 @@ msgstr " msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ÚÁÄÁÅÔ ÎÅÓËÏÌØËÏ ÐÁËÅÔÏ×\n" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "ÕÄÁÌÅÎÉÅ ÜÔÉÈ ÐÁËÅÔÏ× ÎÁÒÕÛÉÔ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "ÏÔËÁÔÉÔØ (+%d,-%d) ÐÁËÅÔÙ Ë %s" @@ -2505,86 +2501,81 @@ msgid "read failed: %s (%d)\n" msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ: %s (%d)\n" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "ÐÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÁÒÈÉÔÅËÔÕÒÙ" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "ÐÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "ÐÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "ÐÕÔØ %s × ÐÁËÅÔÅ %s - ÎÅ ÐÅÒÅÍÅÝÁÅÍÙÊ" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "ËÏÎÆÌÉËÔ ÆÁÊÌÁ %s ÐÒÉ ÐÏÐÙÔËÁÈ ÕÓÔÁÎÏ×ËÉ %s É %s" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" "ÆÁÊÌ %s ÉÚ ÕÓÔÁÎÁ×ÌÉ×ÁÅÍÏÇÏ ÐÁËÅÔÁ %s ËÏÎÆÌÉËÔÕÅÔ Ó ÆÁÊÌÏÍ ÉÚ ÐÁËÅÔÁ %s" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "ÐÁËÅÔ %s (ËÏÔÏÒÙÊ ÎÏ×ÅÅ, ÞÅÍ %s) ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, fuzzy, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ %s ÎÕÖÎÏ %ld%cb ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ %s ÎÕÖÎÏ %ld inodes ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "ÐÁËÅÔ %s pre-transaction syscall(s): %s: ÏÛÉÂËÁ: %s" -#: lib/rpmps.c:280 -#, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "ÐÁËÅÔ %s ÓÏÄÅÒÖÉÔ ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÔÒÅÂÏ×ÁÎÉÑ: %s\n" +#: lib/rpmps.c:262 +#, fuzzy, c-format +msgid "%s is needed by %s%s" +msgstr " ÎÕÖÅÎ ÄÌÑ %s-%s-%s\n" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "ÐÁËÅÔ %s ÓÏÄÅÒÖÉÔ ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ëÏÎÆÌÉËÔÙ: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "ÎÅ ÕÓÔÁÎÏ×ÌÅÎ " + +#: lib/rpmps.c:267 +#, fuzzy, c-format +msgid "%s conflicts with %s%s" +msgstr " ËÏÎÆÌÉËÔÕÅÔ Ó %s-%s-%s\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ %d ÐÒÉ ÒÁÂÏÔÅ Ó ÐÁËÅÔÏÍ %s" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " ËÏÎÆÌÉËÔÕÅÔ Ó %s-%s-%s\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " ÎÕÖÅÎ ÄÌÑ %s-%s-%s\n" - #: lib/rpmrc.c:201 #, c-format msgid "missing second ':' at %s:%d\n" @@ -3397,6 +3388,15 @@ msgstr "url msgid "failed to create %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "ÕÄÁÌÅÎÉÅ ÜÔÉÈ ÐÁËÅÔÏ× ÎÁÒÕÛÉÔ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" + +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "ÐÁËÅÔ %s ÓÏÄÅÒÖÉÔ ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÔÒÅÂÏ×ÁÎÉÑ: %s\n" + +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "ÐÁËÅÔ %s ÓÏÄÅÒÖÉÔ ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ëÏÎÆÌÉËÔÙ: %s\n" + #~ msgid "cannot open rpm database in %s\n" #~ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ RPM × %s\n" diff --git a/po/sk.po b/po/sk.po index eb6f870..ef64dd3 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-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -1497,42 +1497,42 @@ msgstr "Poskytuje:" msgid "(db package)" msgstr "nájdených %d balíkov\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstraòuje sa index skupín\n" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2254,7 +2254,7 @@ msgid "can't query %s: %s\n" msgstr "zmazanie %s zlyhalo: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "otvorenie %s zlyhalo\n" @@ -2505,7 +2505,7 @@ msgstr "chyba pri vytv msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie je mo¾né nain¹talova»\n" @@ -2515,7 +2515,7 @@ 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:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "nevyrie¹ené závislosti:\n" @@ -2538,21 +2538,17 @@ msgstr "nie je mo msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¹pecifikuje viac balíkov\n" -#: lib/rpminstall.c:704 -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:734 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie je mo¾né otvori» %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "In¹taluje sa %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2563,85 +2559,80 @@ msgid "read failed: %s (%d)\n" msgstr "èítanie zlyhalo: %s (%d)" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, fuzzy, c-format msgid "package %s is already installed" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, fuzzy, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" +msgid "%s is needed by %s%s" +msgstr " je vy¾adované %s-%s-%s\n" -#: lib/rpmps.c:284 +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "nein¹talovaný " + +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "balík %s koliduje: %s\n" +msgid "%s conflicts with %s%s" +msgstr " koliduje s %s-%s-%s\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " koliduje s %s-%s-%s\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " je vy¾adované %s-%s-%s\n" - #: lib/rpmrc.c:201 #, fuzzy, c-format msgid "missing second ':' at %s:%d\n" @@ -3464,6 +3455,17 @@ msgstr "url port mus msgid "failed to create %s: %s\n" msgstr "nepodarilo sa vytvori» %s\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "odstránenie týchto balíkov by poru¹ilo závislosti:\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "balík %s koliduje: %s\n" + #, fuzzy #~ msgid "cannot open rpm database in %s\n" #~ msgstr "nie je mo¾né otvori» %s/packages.rpm\n" diff --git a/po/sl.po b/po/sl.po index 3502eba..ff7c4e0 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.265 2002/06/28 13:05:38 jbj Exp $ +# $Id: sl.po,v 1.266 2002/06/28 21:55:12 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -1500,42 +1500,42 @@ msgstr "%s: %-45s DA (db ponudbe)\n" msgid "(db package)" msgstr "ni paketov\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstranjujemo seznam skupin\n" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2254,7 +2254,7 @@ msgid "can't query %s: %s\n" msgstr "ni mo¾no poizvedeti o %s: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "odpiranje %s je bilo neuspe¹no: %s\n" @@ -2507,7 +2507,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:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "%s ni mo¾no namestiti\n" @@ -2517,7 +2517,7 @@ 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:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "neuspe¹ne soodvisnosti:\n" @@ -2540,21 +2540,17 @@ msgstr "ni mo msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" doloèa veè paketov\n" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "ni mo¾no odpreti %s: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "Name¹èanje %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2565,86 +2561,81 @@ msgid "read failed: %s (%d)\n" msgstr "branje je bilo neuspe¹no: %s (%d)" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "paket %s-%s-%s je za drug tip arhitekture" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "paket %s-%s-%s je za drug operacijski sistem" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paket %s-%s-%s je ¾e name¹èen" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paketa %s ni mo¾no prestaviti\n" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, 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/rpmps.c:251 +#: lib/rpmps.c:233 #, 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/rpmps.c:256 +#: lib/rpmps.c:238 #, 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/rpmps.c:261 +#: lib/rpmps.c:243 #, 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/rpmps.c:271 +#: lib/rpmps.c:253 #, 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/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" +msgid "%s is needed by %s%s" +msgstr " potrebuje %s-%s-%s\n" -#: lib/rpmps.c:284 +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "ni name¹èeno " + +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "paket %s jw v sporu z: %s\n" +msgid "%s conflicts with %s%s" +msgstr " je v sporu z %s-%s-%s\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, fuzzy, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "neznana napaka %d ob rokovanju s paketom %s-%s-%s" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " je v sporu z %s-%s-%s\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " potrebuje %s-%s-%s\n" - #: lib/rpmrc.c:201 #, fuzzy, c-format msgid "missing second ':' at %s:%d\n" @@ -3471,6 +3462,17 @@ msgstr "vrata URL morajo biti msgid "failed to create %s: %s\n" msgstr "neuspe¹no ustvarjanje %s: %s\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "paket %s jw v sporu z: %s\n" + #, fuzzy #~ msgid "cannot open rpm database in %s\n" #~ msgstr "datoteke %s/packages.rpm ni mogo¾no odpreti\n" diff --git a/po/sr.po b/po/sr.po index 96ffc0d..3b34491 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" @@ -1485,42 +1485,42 @@ msgstr "" msgid "(db package)" msgstr "upit nad svim paketima" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2247,7 +2247,7 @@ msgid "can't query %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "neuspelo otvaranje %s: %s\n" @@ -2498,7 +2498,7 @@ msgstr "gre msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "gre¹ka: %s se ne mo¾e instalirati\n" @@ -2508,7 +2508,7 @@ msgstr "gre msgid "found %d source and %d binary packages\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "lo¹e meðuzavisnosti:\n" @@ -2532,21 +2532,17 @@ msgstr "Ne mogu da otvorim datoteku %s: " msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" odreðuje vi¹e paketa\n" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "uklanjanje oviha paketa æe naru¹iti zavisnosti:\n" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, 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:740 #, c-format msgid "Installing %s\n" msgstr "Instaliram %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "neodstaje paket za deinstalaciju" @@ -2557,85 +2553,80 @@ msgid "read failed: %s (%d)\n" msgstr "neuspelo èitanje: %s (%d)" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, fuzzy, c-format msgid "package %s is already installed" msgstr "paket %s nije instaliran\n" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, fuzzy, c-format msgid "path %s in package %s is not relocateable" msgstr "paket %s nije instaliran\n" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, 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/rpmps.c:256 +#: lib/rpmps.c:238 #, 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/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, fuzzy, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "paket %s nije naveden u %s" +msgid "%s is needed by %s%s" +msgstr " je potreban paketu %s-%s-%s\n" + +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "paket %s nije instaliran\n" -#: lib/rpmps.c:284 +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "paket %s nije naveden u %s" +msgid "%s conflicts with %s%s" +msgstr " se sudara sa %s-%s-%s\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " se sudara sa %s-%s-%s\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " je potreban paketu %s-%s-%s\n" - #: lib/rpmrc.c:201 #, fuzzy, c-format msgid "missing second ':' at %s:%d\n" @@ -3466,6 +3457,17 @@ msgstr "gre msgid "failed to create %s: %s\n" msgstr "neuspelo kreiranje %s\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "uklanjanje oviha paketa æe naru¹iti zavisnosti:\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "paket %s nije naveden u %s" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "paket %s nije naveden u %s" + #, fuzzy #~ msgid "cannot open rpm database in %s\n" #~ msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" diff --git a/po/sv.po b/po/sv.po index 0c0e8d3..856e796 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-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 2002-02-18 21:13+0100\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -1461,23 +1461,23 @@ msgstr "%s: %-45s JA (db-tillhandah msgid "(db package)" msgstr "inga paket\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "ignorera paketnamnsrelation(er) [%d]\t%s -> %s\n" -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tar bort %s-%s-%s \"%s\" från tsort-relationer.\n" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "========== noterar alla relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" @@ -1485,20 +1485,20 @@ msgstr "" "========== tsort:erar paket (ordning, #föregångare, #efterföljare, träd, " "djup)\n" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "========== endast efterföljare (presentationsordning)\n" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "LOOP:\n" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "========== fortsätter med tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2181,7 +2181,7 @@ msgid "can't query %s: %s\n" msgstr "kan inte fråga %s: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "misslyckades med att öppna %s: %s\n" @@ -2431,7 +2431,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:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "%s kan inte installeras\n" @@ -2441,7 +2441,7 @@ 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:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "ouppfyllda beroenden:\n" @@ -2464,21 +2464,17 @@ msgstr "kan inte msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" anger flera paket\n" -#: lib/rpminstall.c:704 -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:734 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "Installerar %s\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, fuzzy, c-format msgid "rollback %d packages to %s" msgstr "återställer (+%d,-%d) paket till %s" @@ -2489,85 +2485,80 @@ msgid "read failed: %s (%d)\n" msgstr "läsning misslyckades: %s (%d)\n" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "paket %s är för en annan arkitektur" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "paket %s är för ett annat operativsystem" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "paket %s är redan installerat" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "sökväg %s i paket %s är inte relokerbar" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, 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/rpmps.c:251 +#: lib/rpmps.c:233 #, 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/rpmps.c:256 +#: lib/rpmps.c:238 #, 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/rpmps.c:261 +#: lib/rpmps.c:243 #, fuzzy, 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/rpmps.c:271 +#: lib/rpmps.c:253 #, 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/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "paket %s systemanrop före transaktion: %s misslyckades: %s" -#: lib/rpmps.c:280 -#, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "paket %s har ouppfyllda Requires: %s\n" +#: lib/rpmps.c:262 +#, fuzzy, c-format +msgid "%s is needed by %s%s" +msgstr " behövs av %s-%s-%s\n" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "paket %s har ouppfyllda Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "oinstallerat " + +#: lib/rpmps.c:267 +#, fuzzy, c-format +msgid "%s conflicts with %s%s" +msgstr " står i konflikt med %s-%s-%s\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "okänt fel %d uppträdde under behandling av paket %s" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " står i konflikt med %s-%s-%s\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " behövs av %s-%s-%s\n" - #: lib/rpmrc.c:201 #, c-format msgid "missing second ':' at %s:%d\n" @@ -3377,6 +3368,15 @@ msgstr "url-port m msgid "failed to create %s: %s\n" msgstr "kunde inte skapa %s: %s\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "att ta bort dessa paket skulle göra sönder beroenden:\n" + +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "paket %s har ouppfyllda Requires: %s\n" + +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "paket %s har ouppfyllda Conflicts: %s\n" + #~ msgid "cannot open rpm database in %s\n" #~ msgstr "kan inte öppna rpmdatabas i %s\n" diff --git a/po/tr.po b/po/tr.po index 4722252..644a134 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-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -1482,23 +1482,23 @@ msgstr "%s: %-45s EVET (db sa msgid "(db package)" msgstr "paket yok\n" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort baðýntýlarýndan %s-%s-%s \"%s\" kaldýrýlýyor\n" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "========== tsort baðýntýlarý kaydediliyor\n" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1506,20 +1506,20 @@ msgid "" msgstr "" "========== paketler tsort'lanýyor (sýra, #öncüller, #ardýllar, derinlik)\n" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "========== sadece ardýllar (sunum sýrasý)\n" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "ÇEVRÝM:\n" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "========== tsort sürüyor ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2214,7 +2214,7 @@ msgid "can't query %s: %s\n" msgstr "%s sorgulanamýyor: %s\n" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "%s açýlamadý: %s\n" @@ -2464,7 +2464,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:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "%s yüklenemedi\n" @@ -2474,7 +2474,7 @@ 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:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 #, fuzzy msgid "Failed dependencies:\n" msgstr "baðýmlýlýklarda hata; gerekli paketler:\n" @@ -2497,21 +2497,17 @@ msgstr "%s dosyas msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" birden fazla paketi tanýmlýyor\n" -#: lib/rpminstall.c:704 -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:734 #, c-format msgid "cannot open %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "%s kuruluyor\n" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2522,85 +2518,80 @@ msgid "read failed: %s (%d)\n" msgstr "okuma baþarýsýz: %s (%d)\n" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, fuzzy, c-format msgid "package %s is intended for a %s architecture" msgstr "%s farklý bir mimari için" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, fuzzy, c-format msgid "package %s is intended for a %s operating system" msgstr "%s farklý bir iþletim sistemi için" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "%s zaten kurulu" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "%s dosya yolu %s paketinde yeniden konumlandýrýlamaz" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, 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/rpmps.c:251 +#: lib/rpmps.c:233 #, 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/rpmps.c:256 +#: lib/rpmps.c:238 #, 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/rpmps.c:261 +#: lib/rpmps.c:243 #, fuzzy, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "%s kurulumu %ld%cb gerektiriyor (%s dosya sisteminde)" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, 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/rpmps.c:276 +#: lib/rpmps.c:258 #, 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/rpmps.c:280 +#: lib/rpmps.c:262 #, fuzzy, c-format -msgid "package %s has unsatisfied Requires: %s\n" -msgstr "paket %s-%s-%s gereksinimi tatmin edici deðil: %s\n" +msgid "%s is needed by %s%s" +msgstr " %s-%s-%s için gerekli\n" + +#: lib/rpmps.c:264 lib/rpmps.c:269 +#, fuzzy +msgid "(installed) " +msgstr "yüklenmedi " -#: lib/rpmps.c:284 +#: lib/rpmps.c:267 #, fuzzy, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" -msgstr "%s paketi çeliþiyor: %s\n" +msgid "%s conflicts with %s%s" +msgstr " %s-%s-%s ile çeliþiyor\n" -#: lib/rpmps.c:289 +#: lib/rpmps.c:273 #, c-format msgid "unknown error %d encountered while manipulating package %s" msgstr "anlaþýlamayan %d hatasý, %s paketi iþlenirken saptandý" -#: lib/rpmps.c:370 -#, fuzzy -msgid "conflicts with" -msgstr " %s-%s-%s ile çeliþiyor\n" - -#: lib/rpmps.c:370 -#, fuzzy -msgid "is needed by" -msgstr " %s-%s-%s için gerekli\n" - #: lib/rpmrc.c:201 #, c-format msgid "missing second ':' at %s:%d\n" @@ -3410,6 +3401,18 @@ msgstr "url portu bir say msgid "failed to create %s: %s\n" msgstr "%s oluþturulamadý: %s\n" +#~ msgid "removing these packages would break dependencies:\n" +#~ msgstr "" +#~ "bu paketin silinmesi aþaðýdakilerin baðýmlýlýklarýný etkileyecektir:\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Requires: %s\n" +#~ msgstr "paket %s-%s-%s gereksinimi tatmin edici deðil: %s\n" + +#, fuzzy +#~ msgid "package %s has unsatisfied Conflicts: %s\n" +#~ msgstr "%s paketi çeliþiyor: %s\n" + #~ msgid "cannot open rpm database in %s\n" #~ msgstr "%s dizininde rpm veritabaný açýlamýyor\n" diff --git a/po/uk.po b/po/uk.po index 5600375..f9150b1 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1438,42 +1438,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2137,7 +2137,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2383,7 +2383,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2393,7 +2393,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2415,21 +2415,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2440,81 +2436,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 diff --git a/po/wa.po b/po/wa.po index 5600375..f9150b1 100644 --- a/po/wa.po +++ b/po/wa.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1438,42 +1438,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2137,7 +2137,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2383,7 +2383,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2393,7 +2393,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2415,21 +2415,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2440,81 +2436,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 diff --git a/po/zh.po b/po/zh.po index 5600375..f9150b1 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1438,42 +1438,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2137,7 +2137,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2383,7 +2383,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2393,7 +2393,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2415,21 +2415,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2440,81 +2436,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 5600375..f9150b1 100644 --- a/po/zh_CN.GB2312.po +++ b/po/zh_CN.GB2312.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-06-28 08:45-0400\n" +"POT-Creation-Date: 2002-06-28 17:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1438,42 +1438,42 @@ msgstr "" msgid "(db package)" msgstr "" -#: lib/depends.c:832 +#: lib/depends.c:834 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:953 +#: lib/depends.c:955 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1229 +#: lib/depends.c:1231 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1335 +#: lib/depends.c:1337 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1428 +#: lib/depends.c:1430 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1498 +#: lib/depends.c:1500 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1533 +#: lib/depends.c:1535 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1538 +#: lib/depends.c:1540 #, c-format msgid "rpmtsOrder failed, %d elements remain\n" msgstr "" @@ -2137,7 +2137,7 @@ msgid "can't query %s: %s\n" msgstr "" #: lib/query.c:635 lib/query.c:669 lib/rpminstall.c:366 lib/rpminstall.c:503 -#: lib/rpminstall.c:888 +#: lib/rpminstall.c:891 #, c-format msgid "open of %s failed: %s\n" msgstr "" @@ -2383,7 +2383,7 @@ msgstr "" msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:495 lib/rpminstall.c:744 +#: lib/rpminstall.c:495 lib/rpminstall.c:747 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2393,7 +2393,7 @@ msgstr "" msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:545 lib/rpminstall.c:1075 +#: lib/rpminstall.c:545 lib/rpminstall.c:704 lib/rpminstall.c:1078 msgid "Failed dependencies:\n" msgstr "" @@ -2415,21 +2415,17 @@ msgstr "" msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:704 -msgid "removing these packages would break dependencies:\n" -msgstr "" - -#: lib/rpminstall.c:731 +#: lib/rpminstall.c:734 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:737 +#: lib/rpminstall.c:740 #, c-format msgid "Installing %s\n" msgstr "" -#: lib/rpminstall.c:1069 +#: lib/rpminstall.c:1072 #, c-format msgid "rollback %d packages to %s" msgstr "" @@ -2440,81 +2436,77 @@ msgid "read failed: %s (%d)\n" msgstr "" #. @observer@ -#: lib/rpmps.c:218 +#: lib/rpmps.c:200 msgid "different" msgstr "" -#: lib/rpmps.c:226 +#: lib/rpmps.c:208 #, c-format msgid "package %s is intended for a %s architecture" msgstr "" -#: lib/rpmps.c:231 +#: lib/rpmps.c:213 #, c-format msgid "package %s is intended for a %s operating system" msgstr "" -#: lib/rpmps.c:236 +#: lib/rpmps.c:218 #, c-format msgid "package %s is already installed" msgstr "" -#: lib/rpmps.c:241 +#: lib/rpmps.c:223 #, c-format msgid "path %s in package %s is not relocateable" msgstr "" -#: lib/rpmps.c:246 +#: lib/rpmps.c:228 #, c-format msgid "file %s conflicts between attempted installs of %s and %s" msgstr "" -#: lib/rpmps.c:251 +#: lib/rpmps.c:233 #, c-format msgid "file %s from install of %s conflicts with file from package %s" msgstr "" -#: lib/rpmps.c:256 +#: lib/rpmps.c:238 #, c-format msgid "package %s (which is newer than %s) is already installed" msgstr "" -#: lib/rpmps.c:261 +#: lib/rpmps.c:243 #, c-format msgid "installing package %s needs %ld%cB on the %s filesystem" msgstr "" -#: lib/rpmps.c:271 +#: lib/rpmps.c:253 #, c-format msgid "installing package %s needs %ld inodes on the %s filesystem" msgstr "" -#: lib/rpmps.c:276 +#: lib/rpmps.c:258 #, c-format msgid "package %s pre-transaction syscall(s): %s failed: %s" msgstr "" -#: lib/rpmps.c:280 +#: lib/rpmps.c:262 #, c-format -msgid "package %s has unsatisfied Requires: %s\n" +msgid "%s is needed by %s%s" msgstr "" -#: lib/rpmps.c:284 -#, c-format -msgid "package %s has unsatisfied Conflicts: %s\n" +#: lib/rpmps.c:264 lib/rpmps.c:269 +msgid "(installed) " msgstr "" -#: lib/rpmps.c:289 +#: lib/rpmps.c:267 #, c-format -msgid "unknown error %d encountered while manipulating package %s" -msgstr "" - -#: lib/rpmps.c:370 -msgid "conflicts with" +msgid "%s conflicts with %s%s" msgstr "" -#: lib/rpmps.c:370 -msgid "is needed by" +#: lib/rpmps.c:273 +#, c-format +msgid "unknown error %d encountered while manipulating package %s" msgstr "" #: lib/rpmrc.c:201 diff --git a/rpm.spec.in b/rpm.spec.in index 688bae0..d63bf2f 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -253,7 +253,6 @@ exit 0 %post %ifos linux /sbin/ldconfig -/bin/rpm --initdb /bin/chown @RPMUSER@.@RPMGROUP@ /var/lib/rpm/[A-Z]* %endif exit 0 @@ -515,6 +514,7 @@ fi - fix: multiple relocations (#67596). - add --build/--program-prefix, delete libtoolize, from %%configure. - find-lang.sh: make sure that mo pattern matches leading '/' (#67368). +- disambiguate added/installed dependency failures (#50388). * Thu Jun 27 2002 Jeff Johnson 4.1-0.33 - use rpmdb-redhat for suggestions if/when configured (#67430). diff --git a/tools/rpmsort.c b/tools/rpmsort.c index 46bf650..1ff5e32 100644 --- a/tools/rpmsort.c +++ b/tools/rpmsort.c @@ -220,7 +220,7 @@ restart: ps = rpmtsProblems(ts); if (ps) { rpmMessage(RPMMESS_ERROR, _("Failed dependencies:\n")); - printDepProblems(stderr, ps); + rpmpsPrint(NULL, ps); ps = rpmpsFree(ps); rc = -1; goto exit;