diff options
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | lib/depends.c | 109 | ||||
| -rw-r--r-- | lib/depends.h | 12 | ||||
| -rw-r--r-- | lib/rpmds.c | 87 | ||||
| -rw-r--r-- | lib/rpmds.h | 26 | ||||
| -rw-r--r-- | lib/transaction.c | 2 | ||||
| -rw-r--r-- | po/cs.po | 102 | ||||
| -rw-r--r-- | po/da.po | 102 | ||||
| -rw-r--r-- | po/de.po | 92 | ||||
| -rw-r--r-- | po/en_RN.po | 85 | ||||
| -rw-r--r-- | po/es.po | 85 | ||||
| -rw-r--r-- | po/eu_ES.po | 85 | ||||
| -rw-r--r-- | po/fi.po | 92 | ||||
| -rw-r--r-- | po/fr.po | 89 | ||||
| -rw-r--r-- | po/gl.po | 85 | ||||
| -rw-r--r-- | po/hu.po | 85 | ||||
| -rw-r--r-- | po/id.po | 85 | ||||
| -rw-r--r-- | po/is.po | 85 | ||||
| -rw-r--r-- | po/it.po | 85 | ||||
| -rw-r--r-- | po/ja.po | 100 | ||||
| -rw-r--r-- | po/ko.po | 103 | ||||
| -rw-r--r-- | po/no.po | 85 | ||||
| -rw-r--r-- | po/pl.po | 97 | ||||
| -rw-r--r-- | po/pt.po | 102 | ||||
| -rw-r--r-- | po/pt_BR.po | 89 | ||||
| -rw-r--r-- | po/ro.po | 85 | ||||
| -rw-r--r-- | po/rpm.pot | 85 | ||||
| -rw-r--r-- | po/ru.po | 102 | ||||
| -rw-r--r-- | po/sk.po | 97 | ||||
| -rw-r--r-- | po/sl.po | 105 | ||||
| -rw-r--r-- | po/sr.po | 92 | ||||
| -rw-r--r-- | po/sv.po | 102 | ||||
| -rw-r--r-- | po/tr.po | 103 | ||||
| -rw-r--r-- | po/uk.po | 85 | ||||
| -rw-r--r-- | po/wa.po | 85 | ||||
| -rw-r--r-- | po/zh.po | 85 | ||||
| -rw-r--r-- | po/zh_CN.GB2312.po | 85 | ||||
| -rw-r--r-- | rpm.spec | 3 | ||||
| -rw-r--r-- | rpm.spec.in | 3 |
39 files changed, 1791 insertions, 1297 deletions
@@ -41,6 +41,8 @@ - create toy rpmDepSet iterators. - rpmRangesOverlap renamed to dsCompare, add dsNotify method as well. - depends.c: rpmDepSet is (almost) opaque, move to rpmds.[ch]. + - rpmds: create dsProblem(), dsiGetDNEVR() retrieved DNEVR, not N. + - depends.h: hack around teIterator() et al from include for now. 4.0.3 -> 4.0.4: diff --git a/lib/depends.c b/lib/depends.c index 888bd104b..6283bb3a0 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -9,7 +9,10 @@ #include <rpmpgp.h> /* XXX pgpFreeDig */ #include "rpmds.h" + +#define _NEED_TEITERATOR 1 #include "depends.h" + #include "rpmal.h" #include "rpmdb.h" /* XXX response cache needs dbiOpen et al. */ @@ -24,6 +27,7 @@ /*@access rpmTransactionSet@*/ /*@access rpmDependencyConflict@*/ +/*@access problemsSet@*/ /** */ @@ -772,8 +776,6 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp, rpmDepSet requires; rpmDepSet conflicts; const char * Name; - const char * EVR; - const char * DNEVR; int_32 Flags; int rc, xx; int ourrc = 0; @@ -787,16 +789,13 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp, if ((Name = dsiGetN(requires)) == NULL) continue; /* XXX can't happen */ - if ((EVR = dsiGetEVR(requires)) == NULL) - continue; /* XXX can't happen */ - if ((DNEVR = dsiGetDNEVR(requires)) == NULL) - continue; /* XXX can't happen */ - Flags = dsiGetFlags(requires); /* Filter out requires that came along for the ride. */ if (keyName && strcmp(keyName, Name)) continue; + Flags = dsiGetFlags(requires); + /* If this requirement comes from the core package only, not libraries, then if we're installing the libraries only, don't count it in. */ if (multiLib && !isDependsMULTILIB(Flags)) @@ -808,44 +807,28 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp, case 0: /* requirements are satisfied. */ /*@switchbreak@*/ break; case 1: /* requirements are not satisfied. */ - rpmMessage(RPMMESS_DEBUG, - _("package %s-%s-%s require not satisfied: %s\n"), - name, version, release, - DNEVR+2); - - if (psp->num == psp->alloced) { - psp->alloced += 5; - psp->problems = xrealloc(psp->problems, sizeof(*psp->problems) * - psp->alloced); - } + { const void ** suggestedPkgs; + + /*@-branchstate@*/ + if (suggestion != NULL) { + int j; - { rpmDependencyConflict pp = psp->problems + psp->num; - pp->byHeader = headerLink(h, "problem(requires)"); - pp->byName = xstrdup(name); - pp->byVersion = xstrdup(version); - pp->byRelease = xstrdup(release); - pp->needsName = xstrdup(Name); - pp->needsVersion = xstrdup(EVR); - pp->needsFlags = Flags; - pp->sense = RPMDEP_SENSE_REQUIRES; - - if (suggestion != NULL) { - int j; - for (j = 0; suggestion[j] != NULL; j++) + for (j = 0; suggestion[j] != NULL; j++) {}; - pp->suggestedPackages = - xmalloc( (j + 1) * sizeof(*pp->suggestedPackages) ); - for (j = 0; suggestion[j] != NULL; j++) - pp->suggestedPackages[j] = - alGetKey(ts->availablePackages, - alGetPkgIndex(ts->availablePackages, suggestion[j])); - pp->suggestedPackages[j] = NULL; - } else { - pp->suggestedPackages = NULL; - } - } - psp->num++; + suggestedPkgs = xmalloc( (j + 1) * sizeof(*suggestedPkgs) ); + for (j = 0; suggestion[j] != NULL; j++) + suggestedPkgs[j] = + alGetKey(ts->availablePackages, + alGetPkgIndex(ts->availablePackages, + suggestion[j])); + suggestedPkgs[j] = NULL; + } else { + suggestedPkgs = NULL; + } + /*@=branchstate@*/ + dsProblem(psp, h, requires, suggestedPkgs); + } /*@switchbreak@*/ break; case 2: /* something went wrong! */ default: @@ -861,16 +844,13 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp, if ((Name = dsiGetN(conflicts)) == NULL) continue; /* XXX can't happen */ - if ((EVR = dsiGetEVR(conflicts)) == NULL) - continue; /* XXX can't happen */ - if ((DNEVR = dsiGetDNEVR(conflicts)) == NULL) - continue; /* XXX can't happen */ - Flags = dsiGetFlags(conflicts); /* Filter out conflicts that came along for the ride. */ if (keyName != NULL && strcmp(keyName, Name)) continue; + Flags = dsiGetFlags(conflicts); + /* If this requirement comes from the core package only, not libraries, then if we're installing the libraries only, don't count it in. */ if (multiLib && !isDependsMULTILIB(Flags)) @@ -881,28 +861,9 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp, /* 1 == unsatisfied, 0 == satsisfied */ switch (rc) { case 0: /* conflicts exist. */ - rpmMessage(RPMMESS_DEBUG, _("package %s conflicts: %s\n"), - name, DNEVR+2); - - if (psp->num == psp->alloced) { - psp->alloced += 5; - psp->problems = xrealloc(psp->problems, - sizeof(*psp->problems) * psp->alloced); - } - - { rpmDependencyConflict pp = psp->problems + psp->num; - pp->byHeader = headerLink(h, "problem(conflicts)"); - pp->byName = xstrdup(name); - pp->byVersion = xstrdup(version); - pp->byRelease = xstrdup(release); - pp->needsName = xstrdup(Name); - pp->needsVersion = xstrdup(EVR); - pp->needsFlags = Flags; - pp->sense = RPMDEP_SENSE_CONFLICTS; - pp->suggestedPackages = NULL; - } - - psp->num++; + /*@-mayaliasunique@*/ /* LCL: NULL may alias h ??? */ + dsProblem(psp, h, conflicts, NULL); + /*@=mayaliasunique@*/ /*@switchbreak@*/ break; case 1: /* conflicts don't exist. */ /*@switchbreak@*/ break; @@ -1124,11 +1085,6 @@ zapRelation(transactionElement q, transactionElement p, continue; if (requires == NULL) continue; /* XXX can't happen */ -#ifdef DYING - if (requires->N == NULL) continue; /* XXX can't happen */ - if (requires->EVR == NULL) continue; /* XXX can't happen */ - if (requires->Flags == NULL) continue; /* XXX can't happen */ -#endif /*@-type@*/ /* FIX: hack */ requires->i = tsi->tsi_reqx; @@ -1196,11 +1152,6 @@ static inline int addRelation(rpmTransactionSet ts, long matchNum; int i = 0; -#ifdef DYING - if (!requires->N || !requires->EVR || !requires->Flags) - return 0; -#endif - /*@-mods -type@*/ /* FIX: hack to disable noisy debugging */ { const char * Type = requires->Type; requires->Type = NULL; diff --git a/lib/depends.h b/lib/depends.h index 11e99337f..751a16a08 100644 --- a/lib/depends.h +++ b/lib/depends.h @@ -15,7 +15,6 @@ typedef /*@abstract@*/ struct transactionElement_s * transactionElement; typedef /*@abstract@*/ struct teIterator_s * teIterator; typedef /*@abstract@*/ struct availableList_s * availableList; -typedef /*@abstract@*/ struct problemsSet_s * problemsSet; /*@unchecked@*/ /*@-exportlocal@*/ @@ -168,19 +167,11 @@ struct rpmTransactionSet_s { } ; -/** \ingroup rpmdep - * Problems encountered while checking dependencies. - */ -struct problemsSet_s { - rpmDependencyConflict problems; /*!< Problems encountered. */ - int num; /*!< No. of problems found. */ - int alloced; /*!< No. of problems allocated. */ -} ; - #ifdef __cplusplus extern "C" { #endif +#if defined(_NEED_TEITERATOR) /*@access teIterator @*/ /*@access rpmTransactionSet @*/ @@ -253,6 +244,7 @@ transactionElement teNextIterator(teIterator tei) return te; /*@=compdef =usereleased@*/ } +#endif /* defined(_NEED_TEITERATOR) */ /** * Return (malloc'd) header name-version-release string. diff --git a/lib/rpmds.c b/lib/rpmds.c index 869c9f477..fea1b685d 100644 --- a/lib/rpmds.c +++ b/lib/rpmds.c @@ -8,20 +8,24 @@ #include "debug.h" +/*@access rpmDependencyConflict @*/ +/*@access problemsSet @*/ + /*@access rpmDepSet @*/ -#if 0 -#define _DS_DEBUG 1 -#endif +/*@unchecked@*/ +static int _ds_debug = 0; rpmDepSet dsFree(rpmDepSet ds) { HFD_t hfd = headerFreeData; rpmTag tagEVR, tagF; -#ifdef _DS_DEBUG +/*@-modfilesystem@*/ +if (_ds_debug) fprintf(stderr, "*** ds %p --\n", ds); -#endif +/*@=modfilesystem@*/ + if (ds == NULL) return ds; @@ -53,10 +57,10 @@ fprintf(stderr, "*** ds %p --\n", ds); /*@=evalorder@*/ ds->h = headerFree(ds->h, "dsFree"); } + /*@=branchstate@*/ ds->DNEVR = _free(ds->DNEVR); - /*@=branchstate@*/ memset(ds, 0, sizeof(*ds)); /* XXX trash and burn */ ds = _free(ds); return NULL; @@ -112,10 +116,13 @@ rpmDepSet dsNew(Header h, rpmTag tagN, int scareMem) ds->h = headerFree(ds->h, "dsNew"); exit: - /*@-nullret@*/ /* FIX: ds->Flags may be NULL. */ -#ifdef _DS_DEBUG + +/*@-modfilesystem@*/ +if (_ds_debug) fprintf(stderr, "*** ds %p ++ %s[%d]\n", ds, ds->Type, ds->Count); -#endif +/*@=modfilesystem@*/ + + /*@-nullret@*/ /* FIX: ds->Flags may be NULL. */ return ds; /*@=nullret@*/ } @@ -166,7 +173,7 @@ const char * dsiGetDNEVR(rpmDepSet ds) if (ds != NULL && ds->i >= 0 && ds->i < ds->Count) { if (ds->DNEVR != NULL) - DNEVR = ds->N[ds->i]; + DNEVR = ds->DNEVR; } return DNEVR; } @@ -232,9 +239,12 @@ int dsiNext(/*@null@*/ rpmDepSet ds) /*@-nullstate@*/ ds->DNEVR = dsDNEVR(t, ds); /*@=nullstate@*/ -#ifdef _DS_DEBUG -fprintf(stderr, "*** ds %p[%d] %s: %s\n", ds, i, ds->Type, ds->DNEVR); -#endif + +/*@-modfilesystem@*/ +if (_ds_debug) +fprintf(stderr, "*** ds %p[%d] %s: %s\n", ds, i, (ds->Type ? ds->Type : "???"), ds->DNEVR); +/*@=modfilesystem@*/ + } } return i; @@ -369,6 +379,57 @@ exit: return result; } +void dsProblem(problemsSet psp, Header h, const rpmDepSet dep, + const void ** suggestedPackages) +{ + rpmDependencyConflict dcp; + const char * Name = dsiGetN(dep); + const char * DNEVR = dsiGetDNEVR(dep); + const char * EVR = dsiGetEVR(dep); + int_32 Flags = dsiGetFlags(dep); + const char * name, * version, * release; + int xx; + + xx = headerNVR(h, &name, &version, &release); + + /*@-branchstate@*/ + if (Name == NULL) Name = "???"; + if (EVR == NULL) EVR = "???"; + if (DNEVR == NULL) DNEVR = "?????"; + /*@=branchstate@*/ + + rpmMessage(RPMMESS_DEBUG, _("package %s-%s-%s has unsatisfied %s: %s\n"), + name, version, release, + dep->Type, + DNEVR+2); + + if (psp->num == psp->alloced) { + psp->alloced += 5; + psp->problems = xrealloc(psp->problems, + sizeof(*psp->problems) * psp->alloced); + } + + dcp = psp->problems + psp->num; + psp->num++; + + dcp->byHeader = headerLink(h, "dsProblem"); + dcp->byName = xstrdup(name); + dcp->byVersion = xstrdup(version); + dcp->byRelease = xstrdup(release); + dcp->needsName = xstrdup(Name); + dcp->needsVersion = xstrdup(EVR); + dcp->needsFlags = Flags; + + if (dep->tagN == RPMTAG_REQUIRENAME) + dcp->sense = RPMDEP_SENSE_REQUIRES; + else if (dep->tagN == RPMTAG_CONFLICTNAME) + dcp->sense = RPMDEP_SENSE_CONFLICTS; + else + dcp->sense = 0; + + dcp->suggestedPackages = suggestedPackages; +} + int rangeMatchesDepFlags (Header h, const rpmDepSet req) { int scareMem = 1; diff --git a/lib/rpmds.h b/lib/rpmds.h index 4fd999953..bd3baab26 100644 --- a/lib/rpmds.h +++ b/lib/rpmds.h @@ -7,6 +7,19 @@ */ /** + */ +typedef /*@abstract@*/ struct problemsSet_s * problemsSet; + +/** + * Problems encountered while checking dependencies. + */ +struct problemsSet_s { + rpmDependencyConflict problems; /*!< Problems encountered. */ + int num; /*!< No. of problems found. */ + int alloced; /*!< No. of problems allocated. */ +} ; + +/** * A package dependency set. */ struct rpmDepSet_s { @@ -34,12 +47,6 @@ struct rpmDepSet_s { extern "C" { #endif -/*@access rpmDepSet @*/ - -#if 0 -#define _DS_DEBUG 1 -#endif - /** * Destroy a new dependency set. * @param ds dependency set @@ -143,6 +150,13 @@ int dsCompare(const rpmDepSet A, const rpmDepSet B) /*@*/; /** + * Report a Requires: or Conflicts: dependency problem. + */ +void dsProblem(problemsSet psp, Header h, const rpmDepSet dep, + /*@only@*/ /*@null@*/ const void ** suggestedPackages) + /*@modifies psp, h @*/; + +/** * Compare package provides dependencies from header with a single dependency. * @param h header * @param ds dependency set diff --git a/lib/transaction.c b/lib/transaction.c index da30f13c4..0b4f35ebd 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -4,7 +4,9 @@ #include "system.h" +#define _NEED_TEITERATOR 1 #include "psm.h" + #include "rpmal.h" #include <rpmmacro.h> /* XXX for rpmExpand */ @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n" "Language-Team: Czech <cs@li.org>\n" @@ -1432,110 +1432,99 @@ msgstr "" msgid " failed - " msgstr "selhal - " -#: lib/depends.c:108 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "nemohu otevřít databázi balíčků v %s\n" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "balíček %s je již nainstalován" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s ANO (rpmrc poskytuje)\n" -#: lib/depends.c:652 +#: lib/depends.c:656 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s ANO (rpmlib poskytuje)\n" -#: lib/depends.c:674 +#: lib/depends.c:678 #, fuzzy msgid "(db files)" msgstr "špatný db soubor %s\n" -#: lib/depends.c:686 +#: lib/depends.c:690 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s ANO (db poskytuje)\n" -#: lib/depends.c:699 +#: lib/depends.c:703 #, fuzzy msgid "(db package)" msgstr "žádné balíčky\n" -#: lib/depends.c:747 +#: lib/depends.c:751 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) přidáno do keše závislostí.\n" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "NE " -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "ANO" -#: lib/depends.c:812 -#, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "balíček %s-%s-%s má nesplněné požadavky: %s\n" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "balíček %s koliduje: %s\n" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, 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:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "========== ukládání tsort relací\n" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== tsorting balíčků (pořadí, #předchůdce, #následovník, hloubka)\n" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "========== pouze úspěšné (pořadí dle prezentace)\n" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "SMYČKA:\n" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "========== pokračuje tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2454,6 +2443,16 @@ msgstr "záznam %d nelze přečíst\n" msgid "package %s is not installed\n" msgstr "balíček %s není nainstalován\n" +#: lib/rpmal.c:728 +#, fuzzy, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "%s: %-45s ANO (přidány soubory)\n" + +#: lib/rpmal.c:826 +#, fuzzy +msgid "(added provide)" +msgstr "%s: %-45s ANO (db poskytuje)\n" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2517,6 +2516,27 @@ msgstr ")" msgid "OK" msgstr "OK" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" +"Závislost \"B\" potřebuje období (předpokládáno stejné jako \"A\")\n" +"\tA %s\tB %s\n" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr " %s A %s\tB %s\n" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, fuzzy, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "balíček %s-%s-%s má nesplněné požadavky: %s\n" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "Připravuji..." @@ -2845,13 +2865,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Podpisu: velikost(%d)+vata(%d)\n" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s přeskočeno, protože chybí příznak\n" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "vynechávám adresář %s\n" @@ -3392,15 +3412,8 @@ msgstr "url port musí být číslo\n" msgid "failed to create %s: %s\n" msgstr "nemohu vytvořit %s: %s\n" -#~ msgid "" -#~ "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" -#~ "\tA %s\tB %s\n" -#~ msgstr "" -#~ "Závislost \"B\" potřebuje období (předpokládáno stejné jako \"A\")\n" -#~ "\tA %s\tB %s\n" - -#~ msgid " %s A %s\tB %s\n" -#~ msgstr " %s A %s\tB %s\n" +#~ msgid "package %s conflicts: %s\n" +#~ msgstr "balíček %s koliduje: %s\n" #, fuzzy #~ msgid "%9s: %-45s %-s (cached)\n" @@ -3418,9 +3431,6 @@ msgstr "nemohu vytvořit %s: %s\n" #~ msgid "%9s: %-45s NO\n" #~ msgstr "%s: %-45s NE\n" -#~ msgid "%s: %-45s YES (added files)\n" -#~ msgstr "%s: %-45s ANO (přidány soubory)\n" - #~ msgid "%s: %-45s YES (added provide)\n" #~ msgstr "%s: %-45s ANO (přidáno poskytuje)\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n" @@ -1433,110 +1433,99 @@ msgstr "" msgid " failed - " msgstr " mislykkedes - " -#: lib/depends.c:108 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kunne ikke ĺbne Packages-database i %s\n" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "pakken %s er allerede installeret" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s JA (rpmrc tilfřrer)\n" -#: lib/depends.c:652 +#: lib/depends.c:656 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s JA (rpmlib tilfřrer)\n" -#: lib/depends.c:674 +#: lib/depends.c:678 #, fuzzy msgid "(db files)" msgstr "ugyldig db-fil %s\n" -#: lib/depends.c:686 +#: lib/depends.c:690 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s JA (db tilfřrer)\n" -#: lib/depends.c:699 +#: lib/depends.c:703 #, fuzzy msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:747 +#: lib/depends.c:751 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) tilfřjet til afhćngigheds-buffer.\n" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 #, fuzzy msgid "NO " msgstr "IKKE O.K." -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "pakke %s skaber konflikt: %s\n" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, 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:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "========== gemmer tsort-relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "========== kun efterfřlgere (prćsentationsrćkkefřlge)\n" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "LŘKKE:\n" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "========== fortsćtter tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2475,6 +2464,16 @@ msgstr "post %d kunne ikke lćses\n" msgid "package %s is not installed\n" msgstr "pakken %s er ikke installeret\n" +#: lib/rpmal.c:728 +#, fuzzy, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "%s: %-45s JA (tilfřjede filer)\n" + +#: lib/rpmal.c:826 +#, fuzzy +msgid "(added provide)" +msgstr "%s: %-45s JA (db tilfřrer)\n" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2538,6 +2537,27 @@ msgstr ")" msgid "OK" msgstr "O.K." +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" +"\"B\"-afhćngighed krćver en epoke (antager samme som \"A\")\n" +"\tA %s\tB %s\n" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr " %s A %s\tB %s\n" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, fuzzy, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "Forbereder..." @@ -2867,13 +2887,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signaturfyld : %d\n" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s oversprunget grundet manglende ok-flag\n" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer kataloget %s\n" @@ -3421,15 +3441,8 @@ msgstr "url-port skal vćre et tal\n" msgid "failed to create %s: %s\n" msgstr "kunne ikke oprette %s: %s\n" -#~ msgid "" -#~ "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" -#~ "\tA %s\tB %s\n" -#~ msgstr "" -#~ "\"B\"-afhćngighed krćver en epoke (antager samme som \"A\")\n" -#~ "\tA %s\tB %s\n" - -#~ msgid " %s A %s\tB %s\n" -#~ msgstr " %s A %s\tB %s\n" +#~ msgid "package %s conflicts: %s\n" +#~ msgstr "pakke %s skaber konflikt: %s\n" #, fuzzy #~ msgid "%9s: %-45s %-s (cached)\n" @@ -3447,9 +3460,6 @@ msgstr "kunne ikke oprette %s: %s\n" #~ msgid "%9s: %-45s NO\n" #~ msgstr "%s: %-45s NEJ\n" -#~ msgid "%s: %-45s YES (added files)\n" -#~ msgstr "%s: %-45s JA (tilfřjede filer)\n" - #~ msgid "%s: %-45s YES (added provide)\n" #~ msgstr "%s: %-45s JA (tilfřjede 'provide')\n" @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n" "Language-Team: German <de@li.org>\n" @@ -1568,111 +1568,100 @@ msgstr "" msgid " failed - " msgstr "pgp fehlgeschlagen" -#: lib/depends.c:108 +#: lib/depends.c:112 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "Paket %s ist nicht installiert\n" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 #, fuzzy msgid "(rpmrc provides)" msgstr "die Datei ť%sŤ gehört zu keinem Paket\n" -#: lib/depends.c:652 +#: lib/depends.c:656 #, fuzzy msgid "(rpmlib provides)" msgstr "die Datei ť%sŤ gehört zu keinem Paket\n" # , c-format -#: lib/depends.c:674 +#: lib/depends.c:678 #, fuzzy msgid "(db files)" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/depends.c:686 +#: lib/depends.c:690 #, fuzzy msgid "(db provides)" msgstr "die Datei ť%sŤ gehört zu keinem Paket\n" -#: lib/depends.c:699 +#: lib/depends.c:703 #, fuzzy msgid "(db package)" msgstr "Anfrage an alle Pakete" -#: lib/depends.c:747 +#: lib/depends.c:751 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "die Datei ť%sŤ gehört zu keinem Paket\n" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, fuzzy, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "Paket %s wird nicht in %s aufgeführt" - -#. conflicts exist. -#: lib/depends.c:884 -#, fuzzy, c-format -msgid "package %s conflicts: %s\n" -msgstr "Paket %s wird nicht in %s aufgeführt" - # FIXME -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, 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:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2656,6 +2645,16 @@ msgstr "Eintrag %d konnte nicht gelesen werden\n" msgid "package %s is not installed\n" msgstr "Paket %s ist nicht installiert\n" +#: lib/rpmal.c:728 +#, fuzzy, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "die Datei ť%sŤ gehört zu keinem Paket\n" + +#: lib/rpmal.c:826 +#, fuzzy +msgid "(added provide)" +msgstr "die Datei ť%sŤ gehört zu keinem Paket\n" + #: lib/rpmchecksig.c:49 #, fuzzy, c-format msgid "%s: open failed: %s\n" @@ -2721,6 +2720,25 @@ msgstr "" msgid "OK" msgstr "" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr "" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, fuzzy, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "Paket %s wird nicht in %s aufgeführt" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -3066,13 +3084,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" @@ -3627,11 +3645,11 @@ msgid "failed to create %s: %s\n" msgstr "anlegen von %s fehlgeschlagen\n" #, fuzzy -#~ msgid "%9s: %-45s %-s (cached)\n" -#~ msgstr "die Datei ť%sŤ gehört zu keinem Paket\n" +#~ msgid "package %s conflicts: %s\n" +#~ msgstr "Paket %s wird nicht in %s aufgeführt" #, fuzzy -#~ msgid "%9s: %-45s YES (db files)\n" +#~ msgid "%9s: %-45s %-s (cached)\n" #~ msgstr "die Datei ť%sŤ gehört zu keinem Paket\n" #, fuzzy diff --git a/po/en_RN.po b/po/en_RN.po index 7a185c17f..da4bab4fb 100644 --- a/po/en_RN.po +++ b/po/en_RN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1410,104 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:108 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:652 +#: lib/depends.c:656 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:674 +#: lib/depends.c:678 msgid "(db files)" msgstr "" -#: lib/depends.c:686 +#: lib/depends.c:690 msgid "(db provides)" msgstr "" -#: lib/depends.c:699 +#: lib/depends.c:703 msgid "(db package)" msgstr "" -#: lib/depends.c:747 +#: lib/depends.c:751 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2409,6 +2398,15 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" +#: lib/rpmal.c:728 +#, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "" + +#: lib/rpmal.c:826 +msgid "(added provide)" +msgstr "" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2472,6 +2470,25 @@ msgstr "" msgid "OK" msgstr "" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr "" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -2796,13 +2813,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1410,104 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:108 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:652 +#: lib/depends.c:656 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:674 +#: lib/depends.c:678 msgid "(db files)" msgstr "" -#: lib/depends.c:686 +#: lib/depends.c:690 msgid "(db provides)" msgstr "" -#: lib/depends.c:699 +#: lib/depends.c:703 msgid "(db package)" msgstr "" -#: lib/depends.c:747 +#: lib/depends.c:751 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2409,6 +2398,15 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" +#: lib/rpmal.c:728 +#, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "" + +#: lib/rpmal.c:826 +msgid "(added provide)" +msgstr "" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2472,6 +2470,25 @@ msgstr "" msgid "OK" msgstr "" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr "" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -2796,13 +2813,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/eu_ES.po b/po/eu_ES.po index 7a185c17f..da4bab4fb 100644 --- a/po/eu_ES.po +++ b/po/eu_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1410,104 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:108 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:652 +#: lib/depends.c:656 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:674 +#: lib/depends.c:678 msgid "(db files)" msgstr "" -#: lib/depends.c:686 +#: lib/depends.c:690 msgid "(db provides)" msgstr "" -#: lib/depends.c:699 +#: lib/depends.c:703 msgid "(db package)" msgstr "" -#: lib/depends.c:747 +#: lib/depends.c:751 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2409,6 +2398,15 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" +#: lib/rpmal.c:728 +#, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "" + +#: lib/rpmal.c:826 +msgid "(added provide)" +msgstr "" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2472,6 +2470,25 @@ msgstr "" msgid "OK" msgstr "" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr "" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -2796,13 +2813,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n" "Language-Team: Finnish <linux@sot.com>\n" "Content-Type: text/plain; charset=\n" @@ -1451,109 +1451,98 @@ msgstr "" msgid " failed - " msgstr "pgp epäonnistui" -#: lib/depends.c:108 +#: lib/depends.c:112 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "virhe: en voi avata %s%s/packages.rpm\n" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 #, fuzzy msgid "(rpmrc provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:652 +#: lib/depends.c:656 #, fuzzy msgid "(rpmlib provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:674 +#: lib/depends.c:678 #, fuzzy msgid "(db files)" msgstr "en voinut avata %s: %s" -#: lib/depends.c:686 +#: lib/depends.c:690 #, fuzzy msgid "(db provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:699 +#: lib/depends.c:703 #, fuzzy msgid "(db package)" msgstr "kysele kaikki paketit" -#: lib/depends.c:747 +#: lib/depends.c:751 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, fuzzy, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "paketti %s ei ole %s:ssä" - -#. conflicts exist. -#: lib/depends.c:884 -#, fuzzy, c-format -msgid "package %s conflicts: %s\n" -msgstr "paketti %s ei ole %s:ssä" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2511,6 +2500,16 @@ msgstr "tietuetta %d ei voitu lukea\n" msgid "package %s is not installed\n" msgstr "paketti %s ei ole asennettu\n" +#: lib/rpmal.c:728 +#, fuzzy, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "tiedostoa %s ei omista mikään paketti\n" + +#: lib/rpmal.c:826 +#, fuzzy +msgid "(added provide)" +msgstr "tiedostoa %s ei omista mikään paketti\n" + #: lib/rpmchecksig.c:49 #, fuzzy, c-format msgid "%s: open failed: %s\n" @@ -2576,6 +2575,25 @@ msgstr "" msgid "OK" msgstr "" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr "" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, fuzzy, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "paketti %s ei ole %s:ssä" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -2916,13 +2934,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" @@ -3468,11 +3486,11 @@ msgid "failed to create %s: %s\n" msgstr "%s:n luonti epäonnistui\n" #, fuzzy -#~ msgid "%9s: %-45s %-s (cached)\n" -#~ msgstr "tiedostoa %s ei omista mikään paketti\n" +#~ msgid "package %s conflicts: %s\n" +#~ msgstr "paketti %s ei ole %s:ssä" #, fuzzy -#~ msgid "%9s: %-45s YES (db files)\n" +#~ msgid "%9s: %-45s %-s (cached)\n" #~ msgstr "tiedostoa %s ei omista mikään paketti\n" #, fuzzy @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1491,106 +1491,95 @@ msgstr "" msgid " failed - " msgstr "La construction a chou.\n" -#: lib/depends.c:108 +#: lib/depends.c:112 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:652 +#: lib/depends.c:656 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:674 +#: lib/depends.c:678 #, fuzzy msgid "(db files)" msgstr "impossible d'ouvrir: %s\n" -#: lib/depends.c:686 +#: lib/depends.c:690 msgid "(db provides)" msgstr "" -#: lib/depends.c:699 +#: lib/depends.c:703 #, fuzzy msgid "(db package)" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/depends.c:747 +#: lib/depends.c:751 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, fuzzy, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "aucun package n'a t spcifi pour l'installation" - -#. conflicts exist. -#: lib/depends.c:884 -#, fuzzy, c-format -msgid "package %s conflicts: %s\n" -msgstr "aucun package n'a t spcifi pour la dsinstallation" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "impossible d'ouvrir: %s\n" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2562,6 +2551,15 @@ msgstr "" msgid "package %s is not installed\n" msgstr "aucun package n'a t spcifi pour l'installation" +#: lib/rpmal.c:728 +#, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "" + +#: lib/rpmal.c:826 +msgid "(added provide)" +msgstr "" + #: lib/rpmchecksig.c:49 #, fuzzy, c-format msgid "%s: open failed: %s\n" @@ -2626,6 +2624,25 @@ msgstr "" msgid "OK" msgstr "" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr "" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, fuzzy, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "aucun package n'a t spcifi pour l'installation" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -2962,13 +2979,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3502,6 +3519,10 @@ msgid "failed to create %s: %s\n" msgstr "impossible d'ouvrir: %s\n" #, fuzzy +#~ msgid "package %s conflicts: %s\n" +#~ msgstr "aucun package n'a t spcifi pour la dsinstallation" + +#, fuzzy #~ msgid "%9s: %-45s NO\n" #~ msgstr "impossible d'ouvrir: %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n" "Language-Team: Galician <trasno@ceu.fi.udc.es>\n" @@ -1405,104 +1405,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:108 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:652 +#: lib/depends.c:656 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:674 +#: lib/depends.c:678 msgid "(db files)" msgstr "" -#: lib/depends.c:686 +#: lib/depends.c:690 msgid "(db provides)" msgstr "" -#: lib/depends.c:699 +#: lib/depends.c:703 msgid "(db package)" msgstr "" -#: lib/depends.c:747 +#: lib/depends.c:751 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2404,6 +2393,15 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" +#: lib/rpmal.c:728 +#, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "" + +#: lib/rpmal.c:826 +msgid "(added provide)" +msgstr "" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2467,6 +2465,25 @@ msgstr "" msgid "OK" msgstr "" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr "" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -2791,13 +2808,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1410,104 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:108 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:652 +#: lib/depends.c:656 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:674 +#: lib/depends.c:678 msgid "(db files)" msgstr "" -#: lib/depends.c:686 +#: lib/depends.c:690 msgid "(db provides)" msgstr "" -#: lib/depends.c:699 +#: lib/depends.c:703 msgid "(db package)" msgstr "" -#: lib/depends.c:747 +#: lib/depends.c:751 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2409,6 +2398,15 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" +#: lib/rpmal.c:728 +#, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "" + +#: lib/rpmal.c:826 +msgid "(added provide)" +msgstr "" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2472,6 +2470,25 @@ msgstr "" msgid "OK" msgstr "" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr "" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -2796,13 +2813,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1410,104 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:108 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:652 +#: lib/depends.c:656 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:674 +#: lib/depends.c:678 msgid "(db files)" msgstr "" -#: lib/depends.c:686 +#: lib/depends.c:690 msgid "(db provides)" msgstr "" -#: lib/depends.c:699 +#: lib/depends.c:703 msgid "(db package)" msgstr "" -#: lib/depends.c:747 +#: lib/depends.c:751 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2409,6 +2398,15 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" +#: lib/rpmal.c:728 +#, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "" + +#: lib/rpmal.c:826 +msgid "(added provide)" +msgstr "" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2472,6 +2470,25 @@ msgstr "" msgid "OK" msgstr "" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr "" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -2796,13 +2813,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen <ra@hp.is>\n" "Language-Team: is <kde-isl@mmedia.is>\n" @@ -1410,105 +1410,94 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:108 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "get ekki opnađ pakka gagnagrunn í\n" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:652 +#: lib/depends.c:656 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:674 +#: lib/depends.c:678 msgid "(db files)" msgstr "" -#: lib/depends.c:686 +#: lib/depends.c:690 msgid "(db provides)" msgstr "" -#: lib/depends.c:699 +#: lib/depends.c:703 #, fuzzy msgid "(db package)" msgstr "uppfćra pakka" -#: lib/depends.c:747 +#: lib/depends.c:751 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2415,6 +2404,15 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" +#: lib/rpmal.c:728 +#, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "" + +#: lib/rpmal.c:826 +msgid "(added provide)" +msgstr "" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2478,6 +2476,25 @@ msgstr "" msgid "OK" msgstr "" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr "" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -2802,13 +2819,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1410,104 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:108 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:652 +#: lib/depends.c:656 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:674 +#: lib/depends.c:678 msgid "(db files)" msgstr "" -#: lib/depends.c:686 +#: lib/depends.c:690 msgid "(db provides)" msgstr "" -#: lib/depends.c:699 +#: lib/depends.c:703 msgid "(db package)" msgstr "" -#: lib/depends.c:747 +#: lib/depends.c:751 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2409,6 +2398,15 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" +#: lib/rpmal.c:728 +#, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "" + +#: lib/rpmal.c:826 +msgid "(added provide)" +msgstr "" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2472,6 +2470,25 @@ msgstr "" msgid "OK" msgstr "" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr "" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -2796,13 +2813,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n" "Language-Team: JRPM <jrpm@linux.or.jp>\n" @@ -1483,109 +1483,98 @@ msgstr "" msgid " failed - " msgstr "źşÇÔ - " -#: lib/depends.c:108 +#: lib/depends.c:112 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "%s/packages.rpm ¤ňĽŞĄźĽ×Ľó¤Ç¤¤Ţ¤ť¤ó\n" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "ĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤Ď¤š¤Ç¤ËĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤š" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %s ¤Ď rpmrc ¤ŹÄ󜥤š¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n" -#: lib/depends.c:652 +#: lib/depends.c:656 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %s ¤Ď rpmrc ¤ŹÄ󜥤š¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n" -#: lib/depends.c:674 +#: lib/depends.c:678 #, fuzzy msgid "(db files)" msgstr "ÉÔŔľ¤ĘĽŐĽĄĽ¤Ľë¤ÎžőÂÖ: %s" -#: lib/depends.c:686 +#: lib/depends.c:690 #, fuzzy msgid "(db provides)" msgstr "%s: %s ¤Ď db ¤ŹÄ󜥤š¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n" -#: lib/depends.c:699 +#: lib/depends.c:703 #, fuzzy msgid "(db package)" msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ň¸Ť¤Ä¤ą¤Ţ¤ˇ¤ż\n" -#: lib/depends.c:747 +#: lib/depends.c:751 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: %s ¤ĎĽŃĽĂĽąĄźĽ¸¤Ë˛Ă¤¨¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, fuzzy, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤Ď require ¤ŹËţ¤ż¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s\n" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "%s ¤ČśĽšç¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤š: %s\n" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "group Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2570,6 +2559,16 @@ msgstr "ĽěĽłĄźĽÉ %d ¤ňĆɤळ¤Č¤Ź¤Ç¤¤Ţ¤ť¤ó¤Ç¤ˇ¤ż\n" msgid "package %s is not installed\n" msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ĎĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó\n" +#: lib/rpmal.c:728 +#, fuzzy, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "%s: %s ¤ĎĽŐĽĄĽ¤ĽëĽęĽšĽČ¤Ë˛Ă¤¨¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n" + +#: lib/rpmal.c:826 +#, fuzzy +msgid "(added provide)" +msgstr "%s: %s ¤Ď db ¤ŹÄ󜥤š¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n" + #: lib/rpmchecksig.c:49 #, fuzzy, c-format msgid "%s: open failed: %s\n" @@ -2635,6 +2634,27 @@ msgstr "" msgid "OK" msgstr "" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" +"\"B\" ¤Î°Í¸Ŕ¤Ď epoch ¤ňÉŹÍפȤˇ¤Ţ¤š(\"A\"¤ČĆą¤¸¤Ç¤˘¤ë¤Č˛žÄꤡ¤Ć)\n" +"\tA %s\tB %s\n" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr "" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, fuzzy, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤Ď require ¤ŹËţ¤ż¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s\n" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -2974,13 +2994,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "˝đĚžĽŃĽĂĽÉ: %d\n" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ¤Ď missingok ĽŐĽéĽ°¤Î¤ż¤áĽšĽĽĂĽ×¤ˇ¤Ţ¤š\n" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "ĽÇĽŁĽěĽŻĽČĽę¤Î˝üł°: %s\n" @@ -3539,22 +3559,14 @@ msgstr "url ĽÝĄźĽČ¤Ďżôťú¤Ç¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó\n" msgid "failed to create %s: %s\n" msgstr "%s ¤ÎşîŔŽ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n" -#~ msgid "" -#~ "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" -#~ "\tA %s\tB %s\n" -#~ msgstr "" -#~ "\"B\" ¤Î°Í¸Ŕ¤Ď epoch ¤ňÉŹÍפȤˇ¤Ţ¤š(\"A\"¤ČĆą¤¸¤Ç¤˘¤ë¤Č˛žÄꤡ¤Ć)\n" -#~ "\tA %s\tB %s\n" +#~ msgid "package %s conflicts: %s\n" +#~ msgstr "%s ¤ČśĽšç¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤š: %s\n" #, fuzzy #~ msgid "%9s: %-45s %-s (cached)\n" #~ msgstr "%s: %s ¤Ď db ĽŃĽĂĽąĄźĽ¸¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ć¤¤¤Ţ¤šĄŁ\n" #, fuzzy -#~ msgid "%9s: %-45s YES (db files)\n" -#~ msgstr "%s: %s ¤ĎĽŐĽĄĽ¤ĽëĽęĽšĽČ¤Ë˛Ă¤¨¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n" - -#, fuzzy #~ msgid "%9s: %-45s YES (db package)\n" #~ msgstr "%s: %s ¤Ď db ĽŃĽĂĽąĄźĽ¸¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ć¤¤¤Ţ¤šĄŁ\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: 2001-09-07 22:03+0900\n" "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n" "Language-Team: GNU Translation project <ko@li.org>\n" @@ -1423,110 +1423,99 @@ msgstr "Çě´őżĄ žĆÄŤŔĚşę ĆÄŔĎŔĚ žř˝Ŕ´Ď´Ů" msgid " failed - " msgstr " ˝ÇĆĐÇÔ - " -#: lib/depends.c:108 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "%s žČŔÇ ĆĐĹ°Áö ľĽŔĚĹÍşŁŔĚ˝ş¸Ś ż źö žř˝Ŕ´Ď´Ů\n" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "%s ĆĐĹ°Áö´Â ŔĚšĚ źłÄĄľÇžî ŔÖ˝Ŕ´Ď´Ů" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s żš (rpmrcŔĚ ÁŚ°řÇÔ)\n" -#: lib/depends.c:652 +#: lib/depends.c:656 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s żš (rpmlibŔĚ ÁŚ°řÇÔ)\n" -#: lib/depends.c:674 +#: lib/depends.c:678 #, fuzzy msgid "(db files)" msgstr "Ŕ߸řľČ db ĆÄŔĎ %s\n" -#: lib/depends.c:686 +#: lib/depends.c:690 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s żš (db°Ą ÁŚ°řÇÔ)\n" -#: lib/depends.c:699 +#: lib/depends.c:703 #, fuzzy msgid "(db package)" msgstr "ĆĐĹ°Áö°Ą žř˝Ŕ´Ď´Ů\n" -#: lib/depends.c:747 +#: lib/depends.c:751 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) ŔÇÁ¸(Depends) Äł˝ĂżĄ Ăß°ĄľÇžú˝Ŕ´Ď´Ů.\n" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "žĆ´ĎżŔ" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "żš" -#: lib/depends.c:812 -#, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "%s-%s-%s ĆĐĹ°ÁöŔÇ ÇĘżä ťçÇ×ŔĚ ¸¸ÁˇľÇÁö žĘŔ˝: %s\n" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "ĆĐĹ°Áö %s (ŔĚ)°Ą ĂćľšÇÔ: %s\n" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort °ü°čżĄź %s-%s-%s \"%s\" (Ŕť)¸Ś ťčÁŚÇŐ´Ď´Ů.\n" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "========== tsort °ü°č¸Ś ąâˇĎ(record)ÇŐ´Ď´Ů\n" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== ĆĐĹ°Áö¸Ś tsort ÇŐ´Ď´Ů (źřź, #źąŔÓŔÚ, #ČÄŔÓŔÚ, ąíŔĚ[depth])\n" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "========== ČÄŔÓŔÚ [successors only] (ÇĽÇö źř)\n" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "ˇçÇÁ(LOOP):\n" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "========== tsort¸Ś ÁřÇŕÇŐ´Ď´Ů...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2460,6 +2449,16 @@ msgstr "ąâˇĎ(record) šřČŁ %u (Ŕş)´Â ŔĐŔť źö žř˝Ŕ´Ď´Ů\n" msgid "package %s is not installed\n" msgstr "%s ĆĐĹ°Áö´Â źłÄĄľÇžî ŔÖÁö žĘ˝Ŕ´Ď´Ů\n" +#: lib/rpmal.c:728 +#, fuzzy, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "%s: %-45s żš (ĆÄŔĎŔĚ Ăß°ĄľĘ)\n" + +#: lib/rpmal.c:826 +#, fuzzy +msgid "(added provide)" +msgstr "%s: %-45s żš (db°Ą ÁŚ°řÇÔ)\n" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2523,6 +2522,27 @@ msgstr ")" msgid "OK" msgstr "ČŽŔÎ" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" +"\"B\" ŔÇÁ¸źşŔş Áßżä˝Ă ľÇ´Â °Í(epoch)Ŕť ÇĘżäˇÎ ÇŐ´Ď´Ů (\"A\" ˇÎ °ĄÁ¤ÇŐ´Ď´Ů)\n" +"\tA %s\tB %s\n" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr " %s A %s\tB %s\n" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, fuzzy, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "%s-%s-%s ĆĐĹ°ÁöŔÇ ÇĘżä ťçÇ×ŔĚ ¸¸ÁˇľÇÁö žĘŔ˝: %s\n" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "ÁŘşń Áß..." @@ -2850,13 +2870,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "ź¸í: size(%d)+pad(%d)\n" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "missingok Ç᥹סΠŔÎÇŘ %s (Ŕť)¸Ś ťýˇŤÇŐ´Ď´Ů\n" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "%s ľđˇşĹ与¸Ś ÁŚżÜ˝ĂĹľ´Ď´Ů\n" @@ -3405,16 +3425,8 @@ msgstr "URL Ć÷ĆŽ´Â šÝľĺ˝Ă źýŔÚŔĚžîžß ÇŐ´Ď´Ů\n" msgid "failed to create %s: %s\n" msgstr "%s (Ŕť)¸Ś ťýźşÇĎ´ÂľĽ ˝ÇĆĐÇÔ: %s\n" -#~ msgid "" -#~ "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" -#~ "\tA %s\tB %s\n" -#~ msgstr "" -#~ "\"B\" ŔÇÁ¸źşŔş Áßżä˝Ă ľÇ´Â °Í(epoch)Ŕť ÇĘżäˇÎ ÇŐ´Ď´Ů (\"A\" ˇÎ °ĄÁ¤ÇŐ´Ď" -#~ "´Ů)\n" -#~ "\tA %s\tB %s\n" - -#~ msgid " %s A %s\tB %s\n" -#~ msgstr " %s A %s\tB %s\n" +#~ msgid "package %s conflicts: %s\n" +#~ msgstr "ĆĐĹ°Áö %s (ŔĚ)°Ą ĂćľšÇÔ: %s\n" #, fuzzy #~ msgid "%9s: %-45s %-s (cached)\n" @@ -3432,9 +3444,6 @@ msgstr "%s (Ŕť)¸Ś ťýźşÇĎ´ÂľĽ ˝ÇĆĐÇÔ: %s\n" #~ msgid "%9s: %-45s NO\n" #~ msgstr "%s: %-45s žĆ´ĎżŔ\n" -#~ msgid "%s: %-45s YES (added files)\n" -#~ msgstr "%s: %-45s żš (ĆÄŔĎŔĚ Ăß°ĄľĘ)\n" - #~ msgid "%s: %-45s YES (added provide)\n" #~ msgstr "%s: %-45s żš (ÁŚ°řŔĚ Ăß°ĄľĘ)\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n" "Language-Team: Norwegian <no@li.org>\n" @@ -1424,105 +1424,94 @@ msgstr "" msgid " failed - " msgstr " feilet - " -#: lib/depends.c:108 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kan ikke ĺpne pakkedatabase i %s\n" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "pakke %s er allerede installert" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:652 +#: lib/depends.c:656 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:674 +#: lib/depends.c:678 msgid "(db files)" msgstr "" -#: lib/depends.c:686 +#: lib/depends.c:690 msgid "(db provides)" msgstr "" -#: lib/depends.c:699 +#: lib/depends.c:703 #, fuzzy msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:747 +#: lib/depends.c:751 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "NEI" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "JA" -#: lib/depends.c:812 -#, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "pakke %s er i konflikt: %s\n" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2437,6 +2426,15 @@ msgstr "" msgid "package %s is not installed\n" msgstr "pakke %s er ikke installert\n" +#: lib/rpmal.c:728 +#, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "" + +#: lib/rpmal.c:826 +msgid "(added provide)" +msgstr "" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2500,6 +2498,25 @@ msgstr "" msgid "OK" msgstr "OK" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr "" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, fuzzy, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "pakke %s er i konflikt: %s\n" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "Forbereder..." @@ -2826,13 +2843,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer katalog %s\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Paweł Dziekoński <pdziekonski@mml.ch.pwr.wroc.pl>\n" "Language-Team: Polish <pl@li.org>\n" @@ -1465,110 +1465,99 @@ msgstr "" msgid " failed - " msgstr " nie powiodło się -" -#: lib/depends.c:108 +#: lib/depends.c:112 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "nie można otworzyć %s/packages.rpm\n" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "pakiet %s-%s-%s jest już zainstalowany" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 #, fuzzy msgid "(rpmrc provides)" msgstr "plik %s nie należy do żadnego pakietu\n" -#: lib/depends.c:652 +#: lib/depends.c:656 #, fuzzy msgid "(rpmlib provides)" msgstr "plik %s nie należy do żadnego pakietu\n" -#: lib/depends.c:674 +#: lib/depends.c:678 #, fuzzy msgid "(db files)" msgstr "błędny status pliku: %s" -#: lib/depends.c:686 +#: lib/depends.c:690 #, fuzzy msgid "(db provides)" msgstr "Udostępniane zasoby:" -#: lib/depends.c:699 +#: lib/depends.c:703 #, fuzzy msgid "(db package)" msgstr "znaleziono %d pakietów\n" -#: lib/depends.c:747 +#: lib/depends.c:751 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "plik %s nie należy do żadnego pakietu\n" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 #, fuzzy msgid "NO " msgstr "NIE DOBRZE" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, fuzzy, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "zależności pakietu %s nie zostały spełnione: %s\n" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "pakiet %s jest w konflikcie: %s\n" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "usuwanie indeksu grupy\n" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2527,6 +2516,16 @@ msgstr "nie można odczytać rekordu %d\n" msgid "package %s is not installed\n" msgstr "pakiet %s nie jest zainstalowany\n" +#: lib/rpmal.c:728 +#, fuzzy, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "plik %s nie należy do żadnego pakietu\n" + +#: lib/rpmal.c:826 +#, fuzzy +msgid "(added provide)" +msgstr "Udostępniane zasoby:" + #: lib/rpmchecksig.c:49 #, fuzzy, c-format msgid "%s: open failed: %s\n" @@ -2591,6 +2590,25 @@ msgstr ")" msgid "OK" msgstr "OK" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" + +#: lib/rpmds.c:375 +#, fuzzy, c-format +msgid " %s A %s\tB %s\n" +msgstr " rpm {--version}" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, fuzzy, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "zależności pakietu %s nie zostały spełnione: %s\n" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -2929,13 +2947,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Blok sygnatury: %d\n" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s pominięty z powodu flagi missingok\n" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "tworzenie katalogu: %s\n" @@ -3483,12 +3501,11 @@ msgstr "port musi być liczbą\n" msgid "failed to create %s: %s\n" msgstr "utworzenie %s nie powiodło się\n" -#, fuzzy -#~ msgid "%9s: %-45s %-s (cached)\n" -#~ msgstr "plik %s nie należy do żadnego pakietu\n" +#~ msgid "package %s conflicts: %s\n" +#~ msgstr "pakiet %s jest w konflikcie: %s\n" #, fuzzy -#~ msgid "%9s: %-45s YES (db files)\n" +#~ msgid "%9s: %-45s %-s (cached)\n" #~ msgstr "plik %s nie należy do żadnego pakietu\n" #, fuzzy @@ -4709,10 +4726,6 @@ msgstr "utworzenie %s nie powiodło się\n" #~ "źródłowyN.rpm" #, fuzzy -#~ msgid " %s {--version}\n" -#~ msgstr " rpm {--version}" - -#, fuzzy #~ msgid "" #~ " %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n" #~ msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: 2000-06-22 01:13+01:00\n" "Last-Translator: José Nuno Coelho Sanarra Pires\n" "Language-Team: pt <kde@poli.org>\n" @@ -1420,110 +1420,99 @@ msgstr "" msgid " failed - " msgstr " falhou - " -#: lib/depends.c:108 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "năo consigo abrir a base de dados Packages em %s\n" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "o pacote %s já está instalado" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s SIM (oferecidos pelo rpmrc)\n" -#: lib/depends.c:652 +#: lib/depends.c:656 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s SIM (oferecidos pela rpmlib)\n" -#: lib/depends.c:674 +#: lib/depends.c:678 #, fuzzy msgid "(db files)" msgstr "ficheiro db inválido %s\n" -#: lib/depends.c:686 +#: lib/depends.c:690 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s SI (oferecidos pelo db)\n" -#: lib/depends.c:699 +#: lib/depends.c:703 #, fuzzy msgid "(db package)" msgstr "nenhum pacote\n" -#: lib/depends.c:747 +#: lib/depends.c:751 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) adicionado ŕ cache de dependęncias.\n" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 #, fuzzy msgid "NO " msgstr "NĂO-OK" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "requisito %s-%s-%s do pacote năo satisfeito: %s\n" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "o pacote %s está em conflito: %s\n" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, 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:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "=========== a guardar as relaçőes do tsort\n" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "========== só os sucessores (ordem de apresentaçăo)\n" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "CICLO:\n" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "========== a prosseguir o tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2451,6 +2440,16 @@ msgstr "o registo %d năo pôde ser lido\n" msgid "package %s is not installed\n" msgstr "o pacote %s năo está instalado\n" +#: lib/rpmal.c:728 +#, fuzzy, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "%s: %-45s SIM (ficheiros adicionados)\n" + +#: lib/rpmal.c:826 +#, fuzzy +msgid "(added provide)" +msgstr "%s: %-45s SI (oferecidos pelo db)\n" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2514,6 +2513,27 @@ msgstr ")" msgid "OK" msgstr "OK" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" +"A dependęncia \"B\" precisa duma época (assumindo a mesma que \"A\")\n" +"\t %s\tB %s\n" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr " %s A %s\tB %s\n" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, fuzzy, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "requisito %s-%s-%s do pacote năo satisfeito: %s\n" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "A preparar..." @@ -2841,13 +2861,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "'Pad' ou preenchimento da assinatura: %d\n" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ignorado devido ŕ opçăo missingok\n" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "a excluir a directoria %s\n" @@ -3384,15 +3404,8 @@ msgstr "o porto do URL tem de ser um número\n" msgid "failed to create %s: %s\n" msgstr "năo consegui criar o %s: %s\n" -#~ msgid "" -#~ "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" -#~ "\tA %s\tB %s\n" -#~ msgstr "" -#~ "A dependęncia \"B\" precisa duma época (assumindo a mesma que \"A\")\n" -#~ "\t %s\tB %s\n" - -#~ msgid " %s A %s\tB %s\n" -#~ msgstr " %s A %s\tB %s\n" +#~ msgid "package %s conflicts: %s\n" +#~ msgstr "o pacote %s está em conflito: %s\n" #, fuzzy #~ msgid "%9s: %-45s %-s (cached)\n" @@ -3410,9 +3423,6 @@ msgstr "năo consegui criar o %s: %s\n" #~ msgid "%9s: %-45s NO\n" #~ msgstr "%s: %-45s NĂO\n" -#~ msgid "%s: %-45s YES (added files)\n" -#~ msgstr "%s: %-45s SIM (ficheiros adicionados)\n" - #~ msgid "%s: %-45s YES (added provide)\n" #~ msgstr "%s: %-45s SIM (oferecidos para adiçăo)\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 2c06d5841..6cc264d99 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" #: build.c:36 #, fuzzy @@ -1578,108 +1578,97 @@ msgid " failed - " msgstr "Construo falhou.\n" # , c-format -#: lib/depends.c:108 +#: lib/depends.c:112 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "No consegui abrir: %s\n" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "no foi passado pacote para instalao" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:652 +#: lib/depends.c:656 msgid "(rpmlib provides)" msgstr "" # , c-format -#: lib/depends.c:674 +#: lib/depends.c:678 #, fuzzy msgid "(db files)" msgstr "No consegui abrir: %s\n" -#: lib/depends.c:686 +#: lib/depends.c:690 msgid "(db provides)" msgstr "" -#: lib/depends.c:699 +#: lib/depends.c:703 #, fuzzy msgid "(db package)" msgstr "pesquise todos os pacotes" -#: lib/depends.c:747 +#: lib/depends.c:751 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, fuzzy, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "no foi passado pacote para instalao" - -#. conflicts exist. -#: lib/depends.c:884 -#, fuzzy, c-format -msgid "package %s conflicts: %s\n" -msgstr "no foi passado pacote para desinstalao" - # , c-format -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "No consegui abrir: %s\n" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2681,6 +2670,15 @@ msgstr "" msgid "package %s is not installed\n" msgstr "no foi passado pacote para instalao" +#: lib/rpmal.c:728 +#, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "" + +#: lib/rpmal.c:826 +msgid "(added provide)" +msgstr "" + # , c-format #: lib/rpmchecksig.c:49 #, fuzzy, c-format @@ -2748,6 +2746,25 @@ msgstr "" msgid "OK" msgstr "" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr "" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, fuzzy, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "no foi passado pacote para instalao" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -3108,7 +3125,7 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3122,7 +3139,7 @@ msgstr "" # "Content-Transfer-Encoding: 8-bit\n" # , c-format #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "RPM verso %s\n" @@ -3677,6 +3694,10 @@ msgstr "" msgid "failed to create %s: %s\n" msgstr "No consegui abrir o pipe tar: %s\n" +#, fuzzy +#~ msgid "package %s conflicts: %s\n" +#~ msgstr "no foi passado pacote para desinstalao" + # , c-format #, fuzzy #~ msgid "%9s: %-45s NO\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton <gafton@redhat.com>\n" "Language-Team: Romanian <ro@li.org>\n" @@ -1405,104 +1405,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:108 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:652 +#: lib/depends.c:656 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:674 +#: lib/depends.c:678 msgid "(db files)" msgstr "" -#: lib/depends.c:686 +#: lib/depends.c:690 msgid "(db provides)" msgstr "" -#: lib/depends.c:699 +#: lib/depends.c:703 msgid "(db package)" msgstr "" -#: lib/depends.c:747 +#: lib/depends.c:751 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2404,6 +2393,15 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" +#: lib/rpmal.c:728 +#, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "" + +#: lib/rpmal.c:826 +msgid "(added provide)" +msgstr "" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2467,6 +2465,25 @@ msgstr "" msgid "OK" msgstr "" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr "" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -2791,13 +2808,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index b44b13de7..e0f93e898 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1410,104 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:108 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:652 +#: lib/depends.c:656 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:674 +#: lib/depends.c:678 msgid "(db files)" msgstr "" -#: lib/depends.c:686 +#: lib/depends.c:690 msgid "(db provides)" msgstr "" -#: lib/depends.c:699 +#: lib/depends.c:703 msgid "(db package)" msgstr "" -#: lib/depends.c:747 +#: lib/depends.c:751 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2409,6 +2398,15 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" +#: lib/rpmal.c:728 +#, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "" + +#: lib/rpmal.c:826 +msgid "(added provide)" +msgstr "" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2472,6 +2470,25 @@ msgstr "" msgid "OK" msgstr "" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr "" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -2796,13 +2813,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: 2001-08-29 13:55-0400\n" "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n" "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n" @@ -1441,111 +1441,100 @@ msgstr "ćÁĘĚ ÁŇČÉ×Á ÎĹ ÎÁĘÄĹÎ × ÚÁÇĎĚĎ×ËĹ ĐÁËĹÔÁ" msgid " failed - " msgstr "ÎĹ ŐÄÁĚĎÓŘ - " -#: lib/depends.c:108 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "ÎĹ ÍĎÇŐ ĎÔËŇŮÔŘ ÂÁÚŐ ÄÁÎÎŮČ Packages × %s\n" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "ĐÁËĹÔ %s ŐÖĹ ŐÓÔÁÎĎ×ĚĹÎ" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s YES (rpmrc provides)\n" -#: lib/depends.c:652 +#: lib/depends.c:656 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s YES (rpmlib provides)\n" -#: lib/depends.c:674 +#: lib/depends.c:678 #, fuzzy msgid "(db files)" msgstr "ÎĹ×ĹŇÎŮĘ ĆÁĘĚ ÂÁÚŮ ÄÁÎÎŮČ %s\n" -#: lib/depends.c:686 +#: lib/depends.c:690 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s YES (db provides)\n" -#: lib/depends.c:699 +#: lib/depends.c:703 #, fuzzy msgid "(db package)" msgstr "ÎĹÔ ĐÁËĹÔĎ×\n" -#: lib/depends.c:747 +#: lib/depends.c:751 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) ÄĎÂÁ×ĚĹÎĎ × ËĹŰ ÚÁ×ÉÓÉÍĎÓÔĹĘ\n" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "îĺT" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "äá" -#: lib/depends.c:812 -#, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "ÔŇĹÂĎ×ÁÎÉŃ ĐÁËĹÔÁ %s-%s-%s ÎĹ ŐÄĎ×ĚĹÔ×ĎŇĹÎŮ: %s\n" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "ĐÁËĹÔ %s ËĎÎĆĚÉËÔŐĹÔ Ó: %s\n" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "ŐÄÁĚŃĹÔÓŃ %s-%s-%s \"%s\" ÉÚ ŐĐĎŇŃÄĎŢĹÎÎŮČ ÚÁ×ÉÓÉÍĎÓÔĹĘ.\n" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "========== ÚÁĐÉÓŘ ŐĐĎŇŃÄĎŢĹÎÎŮČ ÚÁ×ÉÓÉÍĎÓÔĹĘ\n" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== ÓĎŇÔÉŇĎ×ËÁ ĐÁËĹÔĎ× (ĎŢĹŇĹÄÎĎÓÔŘ, #predecessors, #succesors, " "ÇĚŐÂÉÎÁ)\n" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "========== ÔĎĚŘËĎ ĐĎÓĚĹÄĎ×ÁÔĹĚÉ (× ĐĎŇŃÄËĹ ĐŇĹÄÓÔÁ×ĚĹÎÉŃ)\n" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "ăéëě:\n" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "========== ĐŇĎÄĎĚÖĹÎÉĹ ŐĐĎŇŃÄĎŢĹÎÉŃ ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2467,6 +2456,16 @@ msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐŇĎŢÉÔÁÔŘ ÚÁĐÉÓŘ %u\n" msgid "package %s is not installed\n" msgstr "ĐÁËĹÔ %s ÎĹ ŐÓÔÁÎĎ×ĚĹÎ\n" +#: lib/rpmal.c:728 +#, fuzzy, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "%s: %-45s YES (added files)\n" + +#: lib/rpmal.c:826 +#, fuzzy +msgid "(added provide)" +msgstr "%s: %-45s YES (db provides)\n" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2530,6 +2529,27 @@ msgstr ")" msgid "OK" msgstr "Oë" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" +"ÄĚŃ ÚÁ×ÉÓÉÍĎÓÔÉ \"B\" ÎŐÖÎĎ ŐËÁÚÁÔŘ \"epoch\" (ÔÁË ÖĹ ËÁË ÄĚŃ \"A\")\n" +"\tA %s\tB %s\n" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr " %s A %s\tB %s\n" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, fuzzy, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "ÔŇĹÂĎ×ÁÎÉŃ ĐÁËĹÔÁ %s-%s-%s ÎĹ ŐÄĎ×ĚĹÔ×ĎŇĹÎŮ: %s\n" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "đĎÄÇĎÔĎ×ËÁ..." @@ -2858,13 +2878,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "đĎÄĐÉÓŘ: ŇÁÚÍĹŇ(%d)+ÚÁĐĎĚÎĹÎÉĹ(%d)\n" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ĐŇĎĐŐÝĹÎ ÉÚ-ÚÁ ĆĚÁÇÁ missingok\n" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "ÉÓËĚŔŢÁĹÔÓŃ ËÁÔÁĚĎÇ %s\n" @@ -3410,15 +3430,8 @@ msgstr "url ĐĎŇÔ ÄĎĚÖĹÎ ÂŮÔŘ ŢÉÓĚĎÍ\n" msgid "failed to create %s: %s\n" msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ %s: %s\n" -#~ msgid "" -#~ "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" -#~ "\tA %s\tB %s\n" -#~ msgstr "" -#~ "ÄĚŃ ÚÁ×ÉÓÉÍĎÓÔÉ \"B\" ÎŐÖÎĎ ŐËÁÚÁÔŘ \"epoch\" (ÔÁË ÖĹ ËÁË ÄĚŃ \"A\")\n" -#~ "\tA %s\tB %s\n" - -#~ msgid " %s A %s\tB %s\n" -#~ msgstr " %s A %s\tB %s\n" +#~ msgid "package %s conflicts: %s\n" +#~ msgstr "ĐÁËĹÔ %s ËĎÎĆĚÉËÔŐĹÔ Ó: %s\n" #, fuzzy #~ msgid "%9s: %-45s %-s (cached)\n" @@ -3436,9 +3449,6 @@ msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ %s: %s\n" #~ msgid "%9s: %-45s NO\n" #~ msgstr "%s: %-45s NO\n" -#~ msgid "%s: %-45s YES (added files)\n" -#~ msgstr "%s: %-45s YES (added files)\n" - #~ msgid "%s: %-45s YES (added provide)\n" #~ msgstr "%s: %-45s YES (added provide)\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n" "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n" @@ -1464,110 +1464,99 @@ msgstr "" msgid " failed - " msgstr " zlyhalo - " -#: lib/depends.c:108 +#: lib/depends.c:112 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "nie je možné otvoriť %s/packages.rpm\n" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "balík %s nie je nainštalovaný\n" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 #, fuzzy msgid "(rpmrc provides)" msgstr "súbor %s nie je vlastnený žiadnym balíkom\n" -#: lib/depends.c:652 +#: lib/depends.c:656 #, fuzzy msgid "(rpmlib provides)" msgstr "súbor %s nie je vlastnený žiadnym balíkom\n" -#: lib/depends.c:674 +#: lib/depends.c:678 #, fuzzy msgid "(db files)" msgstr "chybný stav súboru: %s" -#: lib/depends.c:686 +#: lib/depends.c:690 #, fuzzy msgid "(db provides)" msgstr "Poskytuje:" -#: lib/depends.c:699 +#: lib/depends.c:703 #, fuzzy msgid "(db package)" msgstr "nájdených %d balíkov\n" -#: lib/depends.c:747 +#: lib/depends.c:751 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "súbor %s nie je vlastnený žiadnym balíkom\n" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 #, fuzzy msgid "NO " msgstr "NIE JE V PORIADKU" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, fuzzy, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "požiadavka balíka %s nie je uspokojená: %s\n" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "balík %s koliduje: %s\n" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, 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:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2524,6 +2513,16 @@ msgstr "záznam %d nie je možné prečítať\n" msgid "package %s is not installed\n" msgstr "balík %s nie je nainštalovaný\n" +#: lib/rpmal.c:728 +#, fuzzy, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "súbor %s nie je vlastnený žiadnym balíkom\n" + +#: lib/rpmal.c:826 +#, fuzzy +msgid "(added provide)" +msgstr "Poskytuje:" + #: lib/rpmchecksig.c:49 #, fuzzy, c-format msgid "%s: open failed: %s\n" @@ -2588,6 +2587,25 @@ msgstr ")" msgid "OK" msgstr "V PORIADKU" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" + +#: lib/rpmds.c:375 +#, fuzzy, c-format +msgid " %s A %s\tB %s\n" +msgstr " rpm {--version}" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, fuzzy, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "požiadavka balíka %s nie je uspokojená: %s\n" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -2926,13 +2944,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Doplnenie podpisu: %d\n" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s vynechané kvôli príznaku missingok\n" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "vytvára sa adresár %s\n" @@ -3480,12 +3498,11 @@ msgstr "url port musí byť číslo\n" msgid "failed to create %s: %s\n" msgstr "nepodarilo sa vytvoriť %s\n" -#, fuzzy -#~ msgid "%9s: %-45s %-s (cached)\n" -#~ msgstr "súbor %s nie je vlastnený žiadnym balíkom\n" +#~ msgid "package %s conflicts: %s\n" +#~ msgstr "balík %s koliduje: %s\n" #, fuzzy -#~ msgid "%9s: %-45s YES (db files)\n" +#~ msgid "%9s: %-45s %-s (cached)\n" #~ msgstr "súbor %s nie je vlastnený žiadnym balíkom\n" #, fuzzy @@ -4731,10 +4748,6 @@ msgstr "nepodarilo sa vytvoriť %s\n" #~ "rpm" #, fuzzy -#~ msgid " %s {--version}\n" -#~ msgstr " rpm {--version}" - -#, fuzzy #~ msgid "" #~ " %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n" #~ msgstr "" @@ -1,12 +1,12 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000. -# $Id: sl.po,v 1.188 2001/11/03 02:34:32 jbj Exp $ +# $Id: sl.po,v 1.189 2001/11/04 15:43:37 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -1465,110 +1465,99 @@ msgstr "" msgid " failed - " msgstr " neuspešno - " -#: lib/depends.c:108 +#: lib/depends.c:112 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "zbirko podatkov paketov ni možno odpreti v %s\n" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paket %s-%s-%s je že nameščen" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s DA (rpmrc ponudbe)\n" -#: lib/depends.c:652 +#: lib/depends.c:656 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s DA (rpmlib ponudbe)\n" -#: lib/depends.c:674 +#: lib/depends.c:678 #, fuzzy msgid "(db files)" msgstr "poškodovana zbirka podatkov %s" -#: lib/depends.c:686 +#: lib/depends.c:690 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s DA (db ponudbe)\n" -#: lib/depends.c:699 +#: lib/depends.c:703 #, fuzzy msgid "(db package)" msgstr "ni paketov\n" -#: lib/depends.c:747 +#: lib/depends.c:751 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 #, fuzzy msgid "NO " msgstr "NI DOBRO" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, fuzzy, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "paket %s jw v sporu z: %s\n" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstranjujemo seznam skupin\n" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2523,6 +2512,16 @@ msgstr "zapisa %d ni možno prebrati\n" msgid "package %s is not installed\n" msgstr "paket %s ni nameščen\n" +#: lib/rpmal.c:728 +#, fuzzy, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "%s: %-45s DA (dodane datoteke)\n" + +#: lib/rpmal.c:826 +#, fuzzy +msgid "(added provide)" +msgstr "%s: %-45s DA (db ponudbe)\n" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2586,6 +2585,27 @@ msgstr ")" msgid "OK" msgstr "V REDU" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" +"odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n" +"\tA %s\tB %s\n" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr " %s A %s\tB %s\n" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, fuzzy, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -2922,13 +2942,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Dolž. polnila : %d\n" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s preskočen zaradi manjkajoče zastavice OK\n" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "izključevanje imenika %s\n" @@ -3481,15 +3501,8 @@ msgstr "vrata URL morajo biti številka\n" msgid "failed to create %s: %s\n" msgstr "neuspešno ustvarjanje %s: %s\n" -#~ msgid "" -#~ "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" -#~ "\tA %s\tB %s\n" -#~ msgstr "" -#~ "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n" -#~ "\tA %s\tB %s\n" - -#~ msgid " %s A %s\tB %s\n" -#~ msgstr " %s A %s\tB %s\n" +#~ msgid "package %s conflicts: %s\n" +#~ msgstr "paket %s jw v sporu z: %s\n" #, fuzzy #~ msgid "%9s: %-45s %-s (cached)\n" @@ -3508,10 +3521,6 @@ msgstr "neuspešno ustvarjanje %s: %s\n" #~ msgstr "%s: %-45s NE\n" #, fuzzy -#~ msgid "%s: %-45s YES (added files)\n" -#~ msgstr "%s: %-45s DA (dodane datoteke)\n" - -#, fuzzy #~ msgid "%s: %-45s YES (added provide)\n" #~ msgstr "%s: %-45s DA (dodane ponudbe)\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" @@ -1449,109 +1449,98 @@ msgstr "" msgid " failed - " msgstr "PGP omanuo" -#: lib/depends.c:108 +#: lib/depends.c:112 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "greška: ne mogu da otvorim %s%s/packages.rpm\n" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paket %s nije instaliran\n" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 #, fuzzy msgid "(rpmrc provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:652 +#: lib/depends.c:656 #, fuzzy msgid "(rpmlib provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:674 +#: lib/depends.c:678 #, fuzzy msgid "(db files)" msgstr "neuspelo otvaranje %s: %s" -#: lib/depends.c:686 +#: lib/depends.c:690 #, fuzzy msgid "(db provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:699 +#: lib/depends.c:703 #, fuzzy msgid "(db package)" msgstr "upit nad svim paketima" -#: lib/depends.c:747 +#: lib/depends.c:751 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, fuzzy, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "paket %s nije naveden u %s" - -#. conflicts exist. -#: lib/depends.c:884 -#, fuzzy, c-format -msgid "package %s conflicts: %s\n" -msgstr "paket %s nije naveden u %s" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, 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:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2510,6 +2499,16 @@ msgstr "ne mogu da pročitam slog %d\n" msgid "package %s is not installed\n" msgstr "paket %s nije instaliran\n" +#: lib/rpmal.c:728 +#, fuzzy, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "datoteka %s ne pripada nijednom paketu\n" + +#: lib/rpmal.c:826 +#, fuzzy +msgid "(added provide)" +msgstr "datoteka %s ne pripada nijednom paketu\n" + #: lib/rpmchecksig.c:49 #, fuzzy, c-format msgid "%s: open failed: %s\n" @@ -2575,6 +2574,25 @@ msgstr "" msgid "OK" msgstr "" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr "" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, fuzzy, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "paket %s nije naveden u %s" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -2915,13 +2933,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "greška kod kreiranja direktorijuma %s: %s" @@ -3467,11 +3485,11 @@ msgid "failed to create %s: %s\n" msgstr "neuspelo kreiranje %s\n" #, fuzzy -#~ msgid "%9s: %-45s %-s (cached)\n" -#~ msgstr "datoteka %s ne pripada nijednom paketu\n" +#~ msgid "package %s conflicts: %s\n" +#~ msgstr "paket %s nije naveden u %s" #, fuzzy -#~ msgid "%9s: %-45s YES (db files)\n" +#~ msgid "%9s: %-45s %-s (cached)\n" #~ msgstr "datoteka %s ne pripada nijednom paketu\n" #, fuzzy @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: 2001-09-12 14:18+0200\n" "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -1426,110 +1426,99 @@ msgstr "Ingen arkivfilen i huvud" msgid " failed - " msgstr " misslyckades - " -#: lib/depends.c:108 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "kan inte öppna paketdatabas i %s\n" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "paket %s är redan installerat" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s JA (rpmrc tillhandahĺller)\n" -#: lib/depends.c:652 +#: lib/depends.c:656 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s JA (rpmlib tillhandahĺller)\n" -#: lib/depends.c:674 +#: lib/depends.c:678 #, fuzzy msgid "(db files)" msgstr "felaktig db-fil %s\n" -#: lib/depends.c:686 +#: lib/depends.c:690 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s JA (db-tillhandahĺllande)\n" -#: lib/depends.c:699 +#: lib/depends.c:703 #, fuzzy msgid "(db package)" msgstr "inga paket\n" -#: lib/depends.c:747 +#: lib/depends.c:751 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) tillagt till beroendecachen.\n" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "NEJ " -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "JA" -#: lib/depends.c:812 -#, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "paket %s stĺr i konflikt: %s\n" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, 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:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "========== noterar alla relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== tsort:erar paket (ordning, #föregĺngare, #efterföljare, djup)\n" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "========== endast efterföljare (presentationsordning)\n" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "LOOP:\n" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "========== fortsätter med tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2451,6 +2440,16 @@ msgstr "post %u kunde inte läsas\n" msgid "package %s is not installed\n" msgstr "paket %s är inte installerat\n" +#: lib/rpmal.c:728 +#, fuzzy, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "%s: %-45s JA (lade till filer)\n" + +#: lib/rpmal.c:826 +#, fuzzy +msgid "(added provide)" +msgstr "%s: %-45s JA (db-tillhandahĺllande)\n" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2514,6 +2513,27 @@ msgstr ")" msgid "OK" msgstr "OK" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" +"\"B\"-beroendet behöver en epok (antar samma som \"A\")\n" +"\tA %s\tB %s\n" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr " %s A %s\tB %s\n" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, fuzzy, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "Förbereder..." @@ -2843,13 +2863,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s överhoppad pĺ grund av missingok-flagga\n" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "hoppar över katalogen %s\n" @@ -3390,15 +3410,8 @@ msgstr "url-port mĺste vara ett tal\n" msgid "failed to create %s: %s\n" msgstr "kunde inte skapa %s: %s\n" -#~ msgid "" -#~ "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" -#~ "\tA %s\tB %s\n" -#~ msgstr "" -#~ "\"B\"-beroendet behöver en epok (antar samma som \"A\")\n" -#~ "\tA %s\tB %s\n" - -#~ msgid " %s A %s\tB %s\n" -#~ msgstr " %s A %s\tB %s\n" +#~ msgid "package %s conflicts: %s\n" +#~ msgstr "paket %s stĺr i konflikt: %s\n" #, fuzzy #~ msgid "%9s: %-45s %-s (cached)\n" @@ -3416,9 +3429,6 @@ msgstr "kunde inte skapa %s: %s\n" #~ msgid "%9s: %-45s NO\n" #~ msgstr "%s: %-45s NEJ\n" -#~ msgid "%s: %-45s YES (added files)\n" -#~ msgstr "%s: %-45s JA (lade till filer)\n" - #~ msgid "%s: %-45s YES (added provide)\n" #~ msgstr "%s: %-45s JA (lade till tillhandahĺllande)\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n" "Language-Team: Turkish <tr@li.org>\n" @@ -1446,110 +1446,99 @@ msgstr "" msgid " failed - " msgstr " baţarýsýz - " -#: lib/depends.c:108 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "%s de Paket veritabaný açýlamadý\n" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, fuzzy, c-format msgid "package %s already added, ignoring\n" msgstr "%s zaten kurulu" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s EVET (rpmrc sađlar)\n" -#: lib/depends.c:652 +#: lib/depends.c:656 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s EVET (rpmlib sađlar)\n" -#: lib/depends.c:674 +#: lib/depends.c:678 #, fuzzy msgid "(db files)" msgstr "db dosyasý %s hatalý\n" -#: lib/depends.c:686 +#: lib/depends.c:690 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s EVET (db sađlar)\n" -#: lib/depends.c:699 +#: lib/depends.c:703 #, fuzzy msgid "(db package)" msgstr "paket yok\n" -#: lib/depends.c:747 +#: lib/depends.c:751 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) Bađýmlýlar alanýna eklendi.\n" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "HAYIR " -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "EVET" -#: lib/depends.c:812 -#, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "paket %s-%s-%s gereksinimi tatmin edici deđil: %s\n" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "%s paketi çeliţiyor: %s\n" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, 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:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "========== tsort bađýntýlarý kaydediliyor\n" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== paketler tsort'lanýyor (sýra, #öncüller, #ardýllar, derinlik)\n" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "========== sadece ardýllar (sunum sýrasý)\n" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "ÇEVRÝM:\n" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "========== tsort sürüyor ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2474,6 +2463,16 @@ msgstr "%u. kayýt okunamadý\n" msgid "package %s is not installed\n" msgstr "%s paketi kurulu deđil\n" +#: lib/rpmal.c:728 +#, fuzzy, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "%s: %-45s EVET (dosyalar eklendi)\n" + +#: lib/rpmal.c:826 +#, fuzzy +msgid "(added provide)" +msgstr "%s: %-45s EVET (db sađlar)\n" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2537,6 +2536,27 @@ msgstr ")" msgid "OK" msgstr "Tamam" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, fuzzy, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" +"\"B\" bađýmlýlýđý bir dönemsellik gerektirir (tabii ki \"A\" da)\n" +"\tA %s\tB %s\n" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr " %s A %s\tB %s\n" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, fuzzy, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "paket %s-%s-%s gereksinimi tatmin edici deđil: %s\n" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "Hazýrlanýyor..." @@ -2864,13 +2884,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Ýmza: boyut(%d)+iz(%d)\n" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "missingok flamasýndan dolayý %s atlandý\n" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "%s dizini dýţlanýyor\n" @@ -3414,16 +3434,8 @@ msgstr "url portu bir sayý olmalý\n" msgid "failed to create %s: %s\n" msgstr "%s oluţturulamadý: %s\n" -#, fuzzy -#~ msgid "" -#~ "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" -#~ "\tA %s\tB %s\n" -#~ msgstr "" -#~ "\"B\" bađýmlýlýđý bir dönemsellik gerektirir (tabii ki \"A\" da)\n" -#~ "\tA %s\tB %s\n" - -#~ msgid " %s A %s\tB %s\n" -#~ msgstr " %s A %s\tB %s\n" +#~ msgid "package %s conflicts: %s\n" +#~ msgstr "%s paketi çeliţiyor: %s\n" #, fuzzy #~ msgid "%9s: %-45s %-s (cached)\n" @@ -3441,9 +3453,6 @@ msgstr "%s oluţturulamadý: %s\n" #~ msgid "%9s: %-45s NO\n" #~ msgstr "%s: %-45s HAYIR\n" -#~ msgid "%s: %-45s YES (added files)\n" -#~ msgstr "%s: %-45s EVET (dosyalar eklendi)\n" - #~ msgid "%s: %-45s YES (added provide)\n" #~ msgstr "%s: %-45s EVET (önlem eklendi)\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1410,104 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:108 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:652 +#: lib/depends.c:656 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:674 +#: lib/depends.c:678 msgid "(db files)" msgstr "" -#: lib/depends.c:686 +#: lib/depends.c:690 msgid "(db provides)" msgstr "" -#: lib/depends.c:699 +#: lib/depends.c:703 msgid "(db package)" msgstr "" -#: lib/depends.c:747 +#: lib/depends.c:751 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2409,6 +2398,15 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" +#: lib/rpmal.c:728 +#, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "" + +#: lib/rpmal.c:826 +msgid "(added provide)" +msgstr "" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2472,6 +2470,25 @@ msgstr "" msgid "OK" msgstr "" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr "" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -2796,13 +2813,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1410,104 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:108 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:652 +#: lib/depends.c:656 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:674 +#: lib/depends.c:678 msgid "(db files)" msgstr "" -#: lib/depends.c:686 +#: lib/depends.c:690 msgid "(db provides)" msgstr "" -#: lib/depends.c:699 +#: lib/depends.c:703 msgid "(db package)" msgstr "" -#: lib/depends.c:747 +#: lib/depends.c:751 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2409,6 +2398,15 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" +#: lib/rpmal.c:728 +#, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "" + +#: lib/rpmal.c:826 +msgid "(added provide)" +msgstr "" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2472,6 +2470,25 @@ msgstr "" msgid "OK" msgstr "" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr "" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -2796,13 +2813,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1410,104 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:108 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:652 +#: lib/depends.c:656 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:674 +#: lib/depends.c:678 msgid "(db files)" msgstr "" -#: lib/depends.c:686 +#: lib/depends.c:690 msgid "(db provides)" msgstr "" -#: lib/depends.c:699 +#: lib/depends.c:703 msgid "(db package)" msgstr "" -#: lib/depends.c:747 +#: lib/depends.c:751 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2409,6 +2398,15 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" +#: lib/rpmal.c:728 +#, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "" + +#: lib/rpmal.c:826 +msgid "(added provide)" +msgstr "" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2472,6 +2470,25 @@ msgstr "" msgid "OK" msgstr "" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr "" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -2796,13 +2813,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 7a185c17f..da4bab4fb 100644 --- a/po/zh_CN.GB2312.po +++ b/po/zh_CN.GB2312.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-02 21:16-0500\n" +"POT-Creation-Date: 2001-11-04 10:27-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1410,104 +1410,93 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:108 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:341 +#: lib/depends.c:345 #, c-format msgid "newer package %s already added, skipping %s\n" msgstr "" -#: lib/depends.c:346 +#: lib/depends.c:350 #, c-format msgid "package %s already added, ignoring\n" msgstr "" -#: lib/depends.c:351 +#: lib/depends.c:355 #, c-format msgid "older package %s already added, replacing with %s\n" msgstr "" -#: lib/depends.c:600 +#: lib/depends.c:604 msgid "(cached)" msgstr "" -#: lib/depends.c:636 +#: lib/depends.c:640 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:652 +#: lib/depends.c:656 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:674 +#: lib/depends.c:678 msgid "(db files)" msgstr "" -#: lib/depends.c:686 +#: lib/depends.c:690 msgid "(db provides)" msgstr "" -#: lib/depends.c:699 +#: lib/depends.c:703 msgid "(db package)" msgstr "" -#: lib/depends.c:747 +#: lib/depends.c:751 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "NO " msgstr "" -#: lib/depends.c:749 +#: lib/depends.c:753 lib/rpmds.c:223 lib/rpmds.c:376 msgid "YES" msgstr "" -#: lib/depends.c:812 -#, c-format -msgid "package %s-%s-%s require not satisfied: %s\n" -msgstr "" - -#. conflicts exist. -#: lib/depends.c:884 -#, c-format -msgid "package %s conflicts: %s\n" -msgstr "" - -#: lib/depends.c:1147 +#: lib/depends.c:1103 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1399 +#: lib/depends.c:1350 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1473 +#: lib/depends.c:1424 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1548 +#: lib/depends.c:1499 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1609 +#: lib/depends.c:1560 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1644 +#: lib/depends.c:1595 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1649 +#: lib/depends.c:1600 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -2409,6 +2398,15 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" +#: lib/rpmal.c:728 +#, c-format +msgid "%9s: %-45s YES (added files)\n" +msgstr "" + +#: lib/rpmal.c:826 +msgid "(added provide)" +msgstr "" + #: lib/rpmchecksig.c:49 #, c-format msgid "%s: open failed: %s\n" @@ -2472,6 +2470,25 @@ msgstr "" msgid "OK" msgstr "" +#. XXX legacy epoch-less requires/conflicts compatibility +#: lib/rpmds.c:346 +#, c-format +msgid "" +"the \"B\" dependency needs an epoch (assuming same as \"A\")\n" +"\tA %s\tB %s\n" +msgstr "" + +#: lib/rpmds.c:375 +#, c-format +msgid " %s A %s\tB %s\n" +msgstr "" + +#. @=branchstate@ +#: lib/rpmds.c:401 +#, c-format +msgid "package %s-%s-%s has unsatisfied %s: %s\n" +msgstr "" + #: lib/rpminstall.c:153 msgid "Preparing..." msgstr "" @@ -2796,13 +2813,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:239 +#: lib/transaction.c:241 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:878 +#: lib/transaction.c:880 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -553,3 +553,6 @@ fi - create toy rpmDepSet iterators. - rpmRangesOverlap renamed to dsCompare, add dsNotify method as well. - depends.c: rpmDepSet is (almost) opaque, move to rpmds.[ch]. +- rpmds: create dsProblem(), dsiGetDNEVR() retrieved DNEVR, not N. +- depends.h: hack around teIterator() et al from include for now. + diff --git a/rpm.spec.in b/rpm.spec.in index baf88a87a..c7ac5fb15 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -553,3 +553,6 @@ fi - create toy rpmDepSet iterators. - rpmRangesOverlap renamed to dsCompare, add dsNotify method as well. - depends.c: rpmDepSet is (almost) opaque, move to rpmds.[ch]. +- rpmds: create dsProblem(), dsiGetDNEVR() retrieved DNEVR, not N. +- depends.h: hack around teIterator() et al from include for now. + |