From b97f1cf32b47de9019f93e229207f1619b93fd49 Mon Sep 17 00:00:00 2001 From: jbj Date: Sun, 11 Nov 2001 12:47:08 +0000 Subject: [PATCH] - common structure elements for unification of TFI_t and rpmFNSet. CVS patchset: 5173 CVS date: 2001/11/11 12:47:08 --- CHANGES | 1 + build/files.c | 6 +- lib/depends.c | 2 - lib/depends.h | 14 +++- lib/psm.c | 5 +- lib/psm.h | 5 +- lib/rpmal.c | 4 +- lib/rpmds.c | 6 ++ lib/rpmds.h | 100 ++++++++++++++++++++++++---- lib/rpmlib.h | 4 ++ lib/rpmlibprov.c | 1 - lib/transaction.c | 12 ++-- po/cs.po | 184 +++++++++++++++++++++++++--------------------------- po/da.po | 184 +++++++++++++++++++++++++--------------------------- po/de.po | 184 +++++++++++++++++++++++++--------------------------- po/en_RN.po | 184 +++++++++++++++++++++++++--------------------------- po/es.po | 184 +++++++++++++++++++++++++--------------------------- po/eu_ES.po | 184 +++++++++++++++++++++++++--------------------------- po/fi.po | 184 +++++++++++++++++++++++++--------------------------- po/fr.po | 184 +++++++++++++++++++++++++--------------------------- po/gl.po | 184 +++++++++++++++++++++++++--------------------------- po/hu.po | 184 +++++++++++++++++++++++++--------------------------- po/id.po | 184 +++++++++++++++++++++++++--------------------------- po/is.po | 184 +++++++++++++++++++++++++--------------------------- po/it.po | 184 +++++++++++++++++++++++++--------------------------- po/ja.po | 184 +++++++++++++++++++++++++--------------------------- po/ko.po | 184 +++++++++++++++++++++++++--------------------------- po/no.po | 184 +++++++++++++++++++++++++--------------------------- po/pl.po | 184 +++++++++++++++++++++++++--------------------------- po/pt.po | 184 +++++++++++++++++++++++++--------------------------- po/pt_BR.po | 184 +++++++++++++++++++++++++--------------------------- po/ro.po | 184 +++++++++++++++++++++++++--------------------------- po/rpm.pot | 132 ++++++++++++++++++------------------- po/ru.po | 184 +++++++++++++++++++++++++--------------------------- po/sk.po | 184 +++++++++++++++++++++++++--------------------------- po/sl.po | 186 +++++++++++++++++++++++++---------------------------- po/sr.po | 184 +++++++++++++++++++++++++--------------------------- po/sv.po | 184 +++++++++++++++++++++++++--------------------------- po/tr.po | 184 +++++++++++++++++++++++++--------------------------- po/uk.po | 184 +++++++++++++++++++++++++--------------------------- po/wa.po | 184 +++++++++++++++++++++++++--------------------------- po/zh.po | 184 +++++++++++++++++++++++++--------------------------- po/zh_CN.GB2312.po | 184 +++++++++++++++++++++++++--------------------------- rpm.spec | 1 + rpm.spec.in | 1 + 45 files changed, 2808 insertions(+), 3008 deletions(-) diff --git a/CHANGES b/CHANGES index 6549753..ef5cbab 100644 --- a/CHANGES +++ b/CHANGES @@ -52,6 +52,7 @@ - header tag sets are per-transactionElement, not per-availablePackage. - no-brainer refcounts for rpmDepSet and rpmFNSet objects. - strip header tags for erased as well as installed transactionElements. + - common structure elements for unification of TFI_t and rpmFNSet. 4.0.3 -> 4.0.4: diff --git a/build/files.c b/build/files.c index 450761e..c12bda5 100644 --- a/build/files.c +++ b/build/files.c @@ -1340,7 +1340,7 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl, char * a, * d; fi->type = TR_ADDED; - /* XXX add trnsaction set */ + /* XXX add transaction set */ loadFi(NULL, fi, h, 1); fi->dnl = _free(fi->dnl); fi->bnl = _free(fi->bnl); @@ -1350,7 +1350,9 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl, *d = '\0'; fi->bnl = xmalloc(fi->fc * (sizeof(*fi->bnl) + sizeof(*fi->dil))); + /*@-dependenttrans@*/ /* FIX: artifact of spoofing headerGetEntry */ fi->dil = (int *)(fi->bnl + fi->fc); + /*@=dependenttrans@*/ fi->apath = xmalloc(fi->fc * sizeof(*fi->apath) + apathlen); a = (char *)(fi->apath + fi->fc); @@ -1378,7 +1380,9 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl, /* Create disk directory and base name. */ fi->dil[i] = i; + /*@-dependenttrans@*/ /* FIX: artifact of spoofing headerGetEntry */ fi->dnl[fi->dil[i]] = d; + /*@=dependenttrans@*/ d = stpcpy(d, flp->diskURL); /* Make room for the dirName NUL, find start of baseName. */ diff --git a/lib/depends.c b/lib/depends.c index 7c3d9d4..aa588c6 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -10,8 +10,6 @@ #include /* XXX rpmGetPath */ #include /* XXX pgpFreeDig */ -#include "rpmds.h" - #define _NEED_TEITERATOR 1 #include "depends.h" diff --git a/lib/depends.h b/lib/depends.h index bf4b5fb..a863eaa 100644 --- a/lib/depends.h +++ b/lib/depends.h @@ -11,6 +11,13 @@ #include "rpmal.h" +typedef enum rpmTransactionType_e { + TR_ADDED, /*!< Package will be installed. */ + TR_REMOVED /*!< Package will be removed. */ +} rpmTransactionType; + +#include "rpmds.h" + typedef /*@abstract@*/ struct tsortInfo_s * tsortInfo; typedef /*@abstract@*/ struct transactionElement_s * transactionElement; @@ -66,10 +73,14 @@ struct tsortInfo_s { * A single package instance to be installed/removed atomically. */ struct transactionElement_s { +#ifdef DYING enum rpmTransactionType { TR_ADDED, /*!< Package will be installed. */ TR_REMOVED /*!< Package will be removed. */ } type; /*!< Package disposition (installed/removed). */ +#else + rpmTransactionType type; /*!< Package disposition (installed/removed). */ +#endif /*@refcounted@*/ /*@null@*/ Header h; /*!< Package header. */ @@ -278,10 +289,11 @@ transactionElement teNextIterator(teIterator tei) /** * Return next transaction element of type. * @param tei transaction element iterator + * @param type transaction element type selector * @return next transaction element of type, NULL on termination */ /*@unused@*/ static inline /*@dependent@*/ /*@null@*/ -transactionElement teNext(teIterator tei, enum rpmTransactionType type) +transactionElement teNext(teIterator tei, rpmTransactionType type) /*@modifies tei @*/ { transactionElement p; diff --git a/lib/psm.c b/lib/psm.c index fc422fd..06fe4c1 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -9,7 +9,6 @@ #include #include -#include "rpmds.h" #include "depends.h" #include "rpmlead.h" /* writeLead proto */ @@ -1053,8 +1052,8 @@ static int markReplacedFiles(const PSM_t psm) const rpmTransactionSet ts = psm->ts; TFI_t fi = psm->fi; HGE_t hge = (HGE_t)fi->hge; - const struct sharedFileInfo * replaced = fi->replaced; - const struct sharedFileInfo * sfi; + sharedFileInfo replaced = fi->replaced; + sharedFileInfo sfi; rpmdbMatchIterator mi; Header h; unsigned int * offsets; diff --git a/lib/psm.h b/lib/psm.h index 85f9e59..f860bd3 100644 --- a/lib/psm.h +++ b/lib/psm.h @@ -8,12 +8,14 @@ #include "fsm.h" #include "depends.h" +#include "rpmds.h" /*@unchecked@*/ /*@-exportlocal@*/ extern int _fi_debug; /*@=exportlocal@*/ +#ifdef DYING /** */ struct sharedFileInfo { @@ -107,6 +109,7 @@ struct transactionFileInfo_s { /*@refs@*/ int nrefs; /*!< Reference count. */ }; +#endif /* DYING */ /** */ @@ -268,4 +271,4 @@ int psmStage(PSM_t psm, pkgStage stage) } #endif -#endif /* H_ROLLBACK */ +#endif /* H_PSM */ diff --git a/lib/rpmal.c b/lib/rpmal.c index aba7969..4f274d6 100644 --- a/lib/rpmal.c +++ b/lib/rpmal.c @@ -6,9 +6,7 @@ #include -#include "rpmds.h" #include "depends.h" -#include "rpmal.h" #include "debug.h" @@ -136,6 +134,7 @@ static void alFreeIndex(availableList al) } } +#ifdef DYING /** * Return number of packages in list. * @param al available list @@ -146,6 +145,7 @@ static int alGetSize(/*@null@*/ const availableList al) { return (al != NULL ? al->size : 0); } +#endif static inline alNum alKey2Num(/*@unused@*/ /*@null@*/ const availableList al, /*@null@*/ alKey pkgKey) diff --git a/lib/rpmds.c b/lib/rpmds.c index 8f3c59f..beaf9b8 100644 --- a/lib/rpmds.c +++ b/lib/rpmds.c @@ -4,7 +4,11 @@ #include "system.h" #include +#ifdef DYING #include "rpmds.h" +#else +#include "depends.h" /* XXX rpmTransactionType */ +#endif #include "debug.h" @@ -167,7 +171,9 @@ fprintf(stderr, "*** fi %p\t%s[%d]\n", fns, fns->Type, fns->fc); /*@=branchstate@*/ exit: + /*@-nullstate@*/ /* FIX: TFI/rpmFNSet null annotations */ return rpmfnsLink(fns, (fns ? fns->Type : NULL)); + /*@=nullstate@*/ } /*@access rpmDepSet @*/ diff --git a/lib/rpmds.h b/lib/rpmds.h index 72718b3..72be9f6 100644 --- a/lib/rpmds.h +++ b/lib/rpmds.h @@ -7,6 +7,19 @@ */ /** + */ +typedef struct sharedFileInfo_s * sharedFileInfo; + +/** + */ +struct sharedFileInfo_s { + int pkgFileNum; + int otherFileNum; + int otherPkg; + int isRemoved; +}; + +/** * A package filename set. */ struct rpmFNSet_s { @@ -19,29 +32,29 @@ struct rpmFNSet_s { /*@refcounted@*/ /*@null@*/ Header h; /*!< Header for file name set (or NULL) */ -/*@only@*/ /*@null@*/ +/*@only@*/ /*?null?*/ const char ** bnl; /*!< Base name(s) (from header) */ -/*@only@*/ /*@null@*/ +/*@only@*/ /*?null?*/ const char ** dnl; /*!< Directory name(s) (from header) */ -/*@only@*/ /*@null@*/ +/*@only@*/ /*?null?*/ const char ** fmd5s; /*!< File MD5 sum(s) (from header) */ -/*@only@*/ /*@null@*/ +/*@only@*/ /*?null?*/ const char ** flinks; /*!< File link(s) (from header) */ -/*@only@*/ /*@null@*/ +/*@only@*/ /*?null?*/ const char ** flangs; /*!< File lang(s) */ -/*@only@*/ /*@null@*/ - const uint_32 * dil; /*!< Directory indice(s) (from header) */ -/*@only@*/ /*@null@*/ +/*@only@*/ /*?null?*/ + uint_32 * dil; /*!< Directory indice(s) (from header) */ +/*@only@*/ /*?null?*/ const uint_32 * fflags; /*!< File flag(s) (from header) */ -/*@only@*/ /*@null@*/ +/*@only@*/ /*?null?*/ const uint_32 * fsizes; /*!< File size(s) (from header) */ -/*@only@*/ /*@null@*/ +/*@only@*/ /*?null?*/ const uint_32 * fmtimes; /*!< File modification time(s) (from header) */ -/*@only@*/ /*@null@*/ - const uint_16 * fmodes; /*!< File mode(s) (from header) */ -/*@only@*/ /*@null@*/ +/*@only@*/ /*?null?*/ + uint_16 * fmodes; /*!< File mode(s) (from header) */ +/*@only@*/ /*?null?*/ const uint_16 * frdevs; /*!< File rdev(s) (from header) */ /*@only@*/ /*@null@*/ @@ -58,6 +71,67 @@ struct rpmFNSet_s { int_32 dc; /*!< No. of directories. */ int_32 fc; /*!< No. of files. */ + +/*=============================*/ +/*@owned@*/ + const char * name; /*!< Name: tag (malloc'd). */ +/*@owned@*/ + const char * version; /*!< Version: tag (malloc'd). */ +/*@owned@*/ + const char * release; /*!< Release: tag (malloc'd). */ + uint_32 multiLib; /* MULTILIB */ +/*@null@*/ + fnpyKey key; /*!< Package notify key. */ +/*@null@*/ /*@dependent@*/ + rpmRelocation * relocs; /*!< Package file relocations. */ +/*@null@*/ + FD_t fd; /*!< Package file handle */ + rpmTransactionType type; + HGE_t hge; /*!< Vector to headerGetEntry() */ + HAE_t hae; /*!< Vector to headerAddEntry() */ + HME_t hme; /*!< Vector to headerModifyEntry() */ + HRE_t hre; /*!< Vector to headerRemoveEntry() */ + HFD_t hfd; /*!< Vector to headerFreeData() */ + int_32 epoch; +/*-----------------------------*/ + uid_t uid; /*!< File uid (default). */ + gid_t gid; /*!< File gid (default). */ + uint_32 flags; /*!< File flags (default). */ + fileAction action; /*!< File disposition (default). */ +/*@owned@*/ + fileAction * actions; /*!< File disposition(s). */ +/*@owned@*/ + struct fingerPrint_s * fps; /*!< File fingerprint(s). */ +/*@owned@*/ + const char ** obnl; /*!< Original basename(s) (from header) */ +/*@owned@*/ + const char ** odnl; /*!< Original dirname(s) (from header) */ +/*@unused@*/ + int_32 * odil; /*!< Original dirindex(s) (from header) */ + int bnlmax; /*!< Length (in bytes) of longest basename. */ + int dnlmax; /*!< Length (in bytes) of longest dirname. */ + int astriplen; + int striplen; + unsigned int archiveSize; + mode_t dperms; /*!< Directory perms (0755) if not mapped. */ + mode_t fperms; /*!< File perms (0644) if not mapped. */ +/*@only@*/ /*@null@*/ + const char ** apath; + int mapflags; +/*@owned@*/ /*@null@*/ + int * fmapflags; +/*@owned@*/ + FSM_t fsm; /*!< File state machine data. */ + int keep_header; /*!< Keep header? */ +/*@owned@*/ + sharedFileInfo replaced; /*!< (TR_ADDED) */ +/*@owned@*/ + uint_32 * replacedSizes; /*!< (TR_ADDED) */ + unsigned int record; /*!< (TR_REMOVED) */ + int magic; +#define TFIMAGIC 0x09697923 +/*=============================*/ + /*@refs@*/ int nrefs; /*!< Reference count. */ }; diff --git a/lib/rpmlib.h b/lib/rpmlib.h index 1e3494e..94d9322 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -1267,7 +1267,11 @@ typedef /*@abstract@*/ struct psm_s * PSM_t; /** \ingroup rpmtrans */ +#ifdef DYING typedef /*@abstract@*/ /*@refcounted@*/ struct transactionFileInfo_s * TFI_t; +#else +typedef /*@abstract@*/ /*@refcounted@*/ struct rpmFNSet_s * TFI_t; +#endif /** * Return package header from file handle. diff --git a/lib/rpmlibprov.c b/lib/rpmlibprov.c index 3ef8bf4..516da9e 100644 --- a/lib/rpmlibprov.c +++ b/lib/rpmlibprov.c @@ -6,7 +6,6 @@ #include -#include "rpmds.h" #include "depends.h" #include "debug.h" diff --git a/lib/transaction.c b/lib/transaction.c index 2114913..a1464d2 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -10,8 +10,6 @@ #define _NEED_TEITERATOR 1 #include "psm.h" -#include "rpmds.h" - #include "fprint.h" #include "legacy.h" /* XXX mdfile */ #include "misc.h" /* XXX stripTrailingChar, splitString, currentDirectory */ @@ -165,8 +163,8 @@ static int osOkay(/*@null@*/ const char * pkgOs) static int sharedCmp(const void * one, const void * two) /*@*/ { - const struct sharedFileInfo * a = one; - const struct sharedFileInfo * b = two; + sharedFileInfo a = (sharedFileInfo) one; + sharedFileInfo b = (sharedFileInfo) two; if (a->otherPkg < b->otherPkg) return -1; @@ -296,7 +294,7 @@ static int filecmp(short mode1, const char * md51, const char * link1, */ /* XXX only ts->{probs,rpmdb} modified */ static int handleInstInstalledFiles(const rpmTransactionSet ts, TFI_t fi, - struct sharedFileInfo * shared, + sharedFileInfo shared, int sharedCount, int reportConflicts) /*@globals fileSystem @*/ /*@modifies ts, fi, fileSystem @*/ @@ -407,7 +405,7 @@ static int handleInstInstalledFiles(const rpmTransactionSet ts, TFI_t fi, */ /* XXX only ts->rpmdb modified */ static int handleRmvdInstalledFiles(const rpmTransactionSet ts, TFI_t fi, - struct sharedFileInfo * shared, int sharedCount) + sharedFileInfo shared, int sharedCount) /*@globals fileSystem @*/ /*@modifies fi, fileSystem @*/ { @@ -916,7 +914,7 @@ int rpmRunTransactions( rpmTransactionSet ts, int totalFileCount = 0; TFI_t fi; struct diskspaceInfo * dip; - struct sharedFileInfo * shared, * sharedList; + sharedFileInfo shared, sharedList; int numShared; int nexti; alKey pkgKey, lastKey; diff --git a/po/cs.po b/po/cs.po index be521bd..b94f1cf 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -607,88 +607,88 @@ msgstr "Soubor uveden dvakr msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Symbolická linka ukazuje na BuildRoot: %s -> %s\n" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Soubor nesouhlasí s prefixem (%s): %s\n" -#: build/files.c:1519 +#: build/files.c:1523 #, c-format msgid "File not found: %s\n" msgstr "Soubor nenalezen: %s\n" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "©patný vlastník/skupina: %s\n" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "Soubor %4d: %07o %s.%s\t %s\n" -#: build/files.c:1678 +#: build/files.c:1682 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "Soubor potøebuje úvodní \"/\": %s\n" -#: build/files.c:1701 +#: build/files.c:1705 #, c-format msgid "Glob not permitted: %s\n" msgstr "Glob není dovolen: %s\n" -#: build/files.c:1716 +#: build/files.c:1720 #, c-format msgid "File not found by glob: %s\n" msgstr "Soubor nenalezen globem: %s\n" -#: build/files.c:1778 +#: build/files.c:1782 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Nemohu otevøít %%files soubor %s: %s\n" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "øádek: %s\n" -#: build/files.c:2162 +#: build/files.c:2166 #, c-format msgid "Bad file: %s: %s\n" msgstr "©patný soubor: %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "Nemohu spustit %s: %s\n" -#: build/files.c:2241 +#: build/files.c:2245 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "Nemohu provést fork %s: %s\n" -#: build/files.c:2325 +#: build/files.c:2329 #, c-format msgid "%s failed\n" msgstr "%s selhalo\n" -#: build/files.c:2329 +#: build/files.c:2333 #, c-format msgid "failed to write all data to %s\n" msgstr "Nemohu zapsat v¹echna data do %s\n" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "Hledám %s: (pou¾it %s)...\n" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, c-format msgid "Failed to find %s:\n" msgstr "Selhalo vyhledání %s:\n" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Zpracovávám soubory: %s-%s-%s\n" @@ -831,7 +831,7 @@ msgstr "Nemohu p msgid "Could not open %s: %s\n" msgstr "Nemohu otevøít %s: %s\n" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, c-format msgid "Unable to write package: %s\n" msgstr "Nemohu zapsat balíèek: %s\n" @@ -861,7 +861,7 @@ msgstr "Nemohu p msgid "Unable to write payload to %s: %s\n" msgstr "Nemohu zapsat payload do %s: %s\n" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "Zapsáno: %s\n" @@ -1432,105 +1432,95 @@ msgstr "" msgid " failed - " msgstr "selhal - " -#: lib/depends.c:114 +#: 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:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, fuzzy, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "balíèek %s je ji¾ nainstalován" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s ANO (rpmrc poskytuje)\n" -#: lib/depends.c:757 +#: lib/depends.c:724 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s ANO (rpmlib poskytuje)\n" -#: lib/depends.c:778 +#: lib/depends.c:745 #, fuzzy msgid "(db files)" msgstr "¹patný db soubor %s\n" -#: lib/depends.c:790 +#: lib/depends.c:757 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s ANO (db poskytuje)\n" -#: lib/depends.c:803 +#: lib/depends.c:770 #, fuzzy msgid "(db package)" msgstr "¾ádné balíèky\n" -#: lib/depends.c:842 +#: lib/depends.c:809 #, 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:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "NE " -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "ANO" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, 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:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "========== ukládání tsort relací\n" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 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:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "SMYÈKA:\n" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "========== pokraèuje tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "(není èíslo)" @@ -1624,88 +1614,88 @@ msgstr "%s vytvo #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "Poèet dataLength() RPM_STRING_TYPE musí být 1.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "Datový typ %d není podporován\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "chybí { po %" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "po %{ chybí }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "prázdný formát znaèky" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "prázdné jméno znaèky" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "neznámá znaèka" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "na konci pole oèekáváno ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "neoèekávaná ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "neoèekávaná }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "ve výrazu oèekáván ?" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "ve výrazu je po ? oèekávána {" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "ve výrazu je oèekávána }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "v podvýrazu je po ? oèekávána :" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "ve výrazu je po : oèekávána {" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "na konci výrazu je oèekáváno |" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "(neznámý typ)" @@ -2230,108 +2220,108 @@ msgstr " koliduje s %s-%s-%s\n" msgid "is needed by" msgstr " je nutné pro %s-%s-%s\n" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "========== relokace\n" -#: lib/psm.c:276 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "%5d vynechávám %s\n" -#: lib/psm.c:279 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d pøemís»uji %s -> %s\n" -#: lib/psm.c:349 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "vynechávám multilib cestu %s%s\n" -#: lib/psm.c:415 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "vynechávám %s %s\n" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "pøemís»uji %s do %s\n" -#: lib/psm.c:504 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "pøemís»uji adresáø %s do %s\n" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "nemohu vytvoøit %s: %s\n" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "nemohu zapsat do %%%s %s\n" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "oèekávám balíèek se zdrojovými kódy, nalezen v¹ak binární\n" -#: lib/psm.c:1324 +#: lib/psm.c:1316 msgid "source package contains no .spec file\n" msgstr "zdrojový balíèek neobsahuje .spec soubor\n" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: spou¹tím %s skript(y) (pokud existují)\n" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "provedení skripletu %s z %s-%s-%s selhalo, návratový kód byl: %s\n" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "provedení %s skripletu z %s-%s-%s selhalo, návratový kód: %d\n" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s obsahuje %d souborù, test = %d\n" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "%s: scriptlet %s selhal (%d), pøeskakuji %s-%s-%s\n" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "u¾ivatel %s neexistuje - pou¾it u¾ivatel root\n" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ita skupina root\n" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalování archívu selhalo %s%s: %s\n" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr " na souboru " -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nemohu otevøít %s: %s\n" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s selhalo\n" @@ -2458,12 +2448,12 @@ msgstr "z msgid "package %s is not installed\n" msgstr "balíèek %s není nainstalován\n" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 #, fuzzy msgid "(added files)" msgstr "¹patný db soubor %s\n" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s ANO (db poskytuje)\n" @@ -2532,7 +2522,7 @@ msgid "OK" msgstr "OK" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2541,13 +2531,13 @@ msgstr "" "Závislost \"B\" potøebuje období (pøedpokládáno stejné jako \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n" @@ -2880,13 +2870,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Podpisu: velikost(%d)+vata(%d)\n" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, 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:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "vynechávám adresáø %s\n" @@ -2909,7 +2899,7 @@ msgstr "chyb #: lib/verify.c:518 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "Nevyøe¹ené závislosti pro %s-%s-%s: " #: lib/verify.c:556 diff --git a/po/da.po b/po/da.po index 0b6f2bc..d157523 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -602,88 +602,88 @@ msgstr "Fil angivet to gange: %s\n" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Symbolsk lænke peger på BuildRoot: %s -> %s\n" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Fil passer ikke til præfiks (%s): %s\n" -#: build/files.c:1519 +#: build/files.c:1523 #, c-format msgid "File not found: %s\n" msgstr "Fil ikke fundet: %s\n" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Ugyldig ejer/gruppe: %s\n" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "Fil %4d: %07o %s.%s\t %s\n" -#: build/files.c:1678 +#: build/files.c:1682 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "Fil kræver foranstillet \"/\": %s\n" -#: build/files.c:1701 +#: build/files.c:1705 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "linie %d: Filnavn ikke tilladt: %s\n" -#: build/files.c:1716 +#: build/files.c:1720 #, c-format msgid "File not found by glob: %s\n" msgstr "Fil ikke fundet med glob: %s\n" -#: build/files.c:1778 +#: build/files.c:1782 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Kunne ikke åbne '%%files'-fil %s: %s\n" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "linie: %s\n" -#: build/files.c:2162 +#: build/files.c:2166 #, c-format msgid "Bad file: %s: %s\n" msgstr "Ugyldig fil: %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "Kunne ikke udføre %s: %s\n" -#: build/files.c:2241 +#: build/files.c:2245 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "Kunne ikke fraspalte ny proces til %s: %s\n" -#: build/files.c:2325 +#: build/files.c:2329 #, c-format msgid "%s failed\n" msgstr "%s mislykkedes\n" -#: build/files.c:2329 +#: build/files.c:2333 #, c-format msgid "failed to write all data to %s\n" msgstr "kunne ikke skrive alle data til %s\n" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "Finder %s: (benytter %s)...\n" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, c-format msgid "Failed to find %s:\n" msgstr "Kunne ikke finde %s:\n" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Gennemløber filer: %s-%s-%s\n" @@ -828,7 +828,7 @@ msgstr "Kunne ikke l msgid "Could not open %s: %s\n" msgstr "Kunne ikke åbne %s: %s\n" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunne ikke skrive pakke: %s\n" @@ -858,7 +858,7 @@ msgstr "Kunne ikke l msgid "Unable to write payload to %s: %s\n" msgstr "Kunne ikke skrive pakkeindhold til %s: %s\n" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1433,105 +1433,95 @@ msgstr "" msgid " failed - " msgstr " mislykkedes - " -#: lib/depends.c:114 +#: 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:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, fuzzy, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "pakken %s er allerede installeret" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s JA (rpmrc tilfører)\n" -#: lib/depends.c:757 +#: lib/depends.c:724 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s JA (rpmlib tilfører)\n" -#: lib/depends.c:778 +#: lib/depends.c:745 #, fuzzy msgid "(db files)" msgstr "ugyldig db-fil %s\n" -#: lib/depends.c:790 +#: lib/depends.c:757 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s JA (db tilfører)\n" -#: lib/depends.c:803 +#: lib/depends.c:770 #, fuzzy msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:842 +#: lib/depends.c:809 #, 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:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 #, fuzzy msgid "NO " msgstr "IKKE O.K." -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, 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:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "========== gemmer tsort-relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "LØKKE:\n" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "========== fortsætter tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "(ikke et tal)" @@ -1624,88 +1614,88 @@ msgstr "%s oprettet som %s\n" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE-antal skal være 1.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "Datatype %d understøttes ikke\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "manglende { efter %" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "manglende } efter %{" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "tomt mærkeformat" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "tomt mærkenavn" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "ukendt mærke" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "] forventet ved slutningen af tabel" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "uventet ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "uventet }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "? forventet i udtryk" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "{ forventet efter ? i udtryk" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "} forventet i udtryk" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr ": forventet efter ?-underudtryk" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "{ forventet efter : i udtryk" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "| forventet ved slutningen af udtryk" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "(ukendt type)" @@ -2249,110 +2239,110 @@ msgstr " skaber konflikt med %s-%s-%s\n" msgid "is needed by" msgstr " kræves af %s-%s-%s\n" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "========== gemmer omrokeringer\n" -#: lib/psm.c:276 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "%5d ekskluderer %s\n" -#: lib/psm.c:279 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d omrokerer %s -> %s\n" -#: lib/psm.c:349 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "ekskluderer multilib-sti %s%s\n" -#: lib/psm.c:415 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "ekskluderer %s %s\n" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "omrokerer %s til %s\n" -#: lib/psm.c:504 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "omrokerer kataloget %s til %s\n" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "kan ikke oprette %s: %s\n" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "kunne ikke skrive til %s\n" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binær fundet\n" -#: lib/psm.c:1324 +#: lib/psm.c:1316 msgid "source package contains no .spec file\n" msgstr "kildepakke indeholder ingen .spec-fil\n" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "kører postinstallations-skript (hvis det findes)\n" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" "kørsel af småskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" "kørsel af småskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "pakke: %s-%s-%s filer test = %d\n" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "bruger %s eksisterer ikke - bruger root\n" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "gruppe %s eksisterer ikke - bruger root\n" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "udpakning af arkiv mislykkedes%s%s: %s\n" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr " for fil " -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s mislykkedes\n" @@ -2479,12 +2469,12 @@ msgstr "post %d kunne ikke l msgid "package %s is not installed\n" msgstr "pakken %s er ikke installeret\n" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 #, fuzzy msgid "(added files)" msgstr "ugyldig db-fil %s\n" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s JA (db tilfører)\n" @@ -2553,7 +2543,7 @@ msgid "OK" msgstr "O.K." #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2562,13 +2552,13 @@ msgstr "" "\"B\"-afhængighed kræver en epoke (antager samme som \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" @@ -2902,13 +2892,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signaturfyld : %d\n" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s oversprunget grundet manglende ok-flag\n" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer kataloget %s\n" @@ -2932,7 +2922,7 @@ msgstr "manglende %s" #: lib/verify.c:518 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "Ikke-tilfredsstillede afhængighedskrav for %s-%s-%s: " #: lib/verify.c:556 diff --git a/po/de.po b/po/de.po index 1744df9..94aaa8b 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -681,94 +681,94 @@ msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" # , c-format -#: build/files.c:1495 +#: build/files.c:1499 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Lesen von %s fehlgeschlagen: %s." -#: build/files.c:1519 +#: build/files.c:1523 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Datei auf dem Server nicht gefunden" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" # , c-format -#: build/files.c:1574 +#: build/files.c:1578 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/files.c:1678 +#: build/files.c:1682 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "Verschiebungen müssen mit einem »/« beginnen" -#: build/files.c:1701 +#: build/files.c:1705 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" -#: build/files.c:1716 +#: build/files.c:1720 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "Datei auf dem Server nicht gefunden" -#: build/files.c:1778 +#: build/files.c:1782 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Fehler: kann Datei %s nicht öffnen\n" # , c-format -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, fuzzy, c-format msgid "line: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: build/files.c:2162 +#: build/files.c:2166 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "Konnte pgp nicht durchführen" -#: build/files.c:2241 +#: build/files.c:2245 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "Konnte Signatur-Ziel (»sigtarget«) nicht lesen" -#: build/files.c:2325 +#: build/files.c:2329 #, fuzzy, c-format msgid "%s failed\n" msgstr "pgp fehlgeschlagen" # , c-format -#: build/files.c:2329 +#: build/files.c:2333 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "anlegen von %s fehlgeschlagen\n" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" # , c-format -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "anlegen von %s fehlgeschlagen\n" # , c-format -#: build/files.c:2626 +#: build/files.c:2630 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" @@ -921,7 +921,7 @@ msgid "Could not open %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen\n" # , c-format -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nicht möglich %s zu schreiben" @@ -956,7 +956,7 @@ msgstr "Nicht m msgid "Unable to write payload to %s: %s\n" msgstr "Nicht möglich %s zu schreiben" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1568,106 +1568,96 @@ msgstr "" msgid " failed - " msgstr "pgp fehlgeschlagen" -#: lib/depends.c:114 +#: 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:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, fuzzy, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "Paket %s ist nicht installiert\n" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 #, fuzzy msgid "(rpmrc provides)" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:757 +#: lib/depends.c:724 #, fuzzy msgid "(rpmlib provides)" msgstr "die Datei »%s« gehört zu keinem Paket\n" # , c-format -#: lib/depends.c:778 +#: lib/depends.c:745 #, fuzzy msgid "(db files)" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/depends.c:790 +#: lib/depends.c:757 #, fuzzy msgid "(db provides)" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/depends.c:803 +#: lib/depends.c:770 #, fuzzy msgid "(db package)" msgstr "Anfrage an alle Pakete" -#: lib/depends.c:842 +#: lib/depends.c:809 #, 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:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" # FIXME -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, 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:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "(keine Zahl)" @@ -1764,91 +1754,91 @@ msgstr "kann Datei %s nicht #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "fehlende { nach %{" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "fehlende } nach %{" # »Tag« übersetzen??? -ke- #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "leeres »Tag«-Format" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "leerer »Tag«-Name" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "unbekannter »Tag«" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "] am Ende des Arrays erwartet" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "unerwartete ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "unerwartete }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "? im Ausdruck erwartet" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 #, fuzzy msgid "{ expected after ? in expression" msgstr "{ nach ? im Ausdruck erwartet" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "} im Ausdruck erwartet" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr ": nach ? Unterausdruck erwartet" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 #, fuzzy msgid "{ expected after : in expression" msgstr "{ nach : im Ausdruck erwartet" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "| am Ende des Ausdrucks erwartet" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "(unbekannter Typ)" @@ -2421,114 +2411,114 @@ msgstr " steht im Konflikt mit %s-%s-%s\n" msgid "is needed by" msgstr " wird von %s-%s-%s gebraucht\n" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" # , c-format -#: lib/psm.c:276 +#: lib/psm.c:274 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "Hole %s heraus\n" -#: lib/psm.c:279 +#: lib/psm.c:277 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "kann Datei %s nicht öffnen: " # , c-format -#: lib/psm.c:349 +#: lib/psm.c:347 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "Hole %s heraus\n" # , c-format -#: lib/psm.c:415 +#: lib/psm.c:413 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "Hole %s heraus\n" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:504 +#: lib/psm.c:502 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1324 +#: lib/psm.c:1316 #, fuzzy msgid "source package contains no .spec file\n" msgstr "Anfrage nach Paket, das die Datei besitzt" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "Keine Stufen ausführen" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "Ausführung des Skripts fehlgeschlagen" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "Ausführung des Skripts fehlgeschlagen" # FIXME shared, besser: "mit anderen geteilte ..." -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp fehlgeschlagen" @@ -2661,12 +2651,12 @@ msgid "package %s is not installed\n" msgstr "Paket %s ist nicht installiert\n" # , c-format -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 #, fuzzy msgid "(added files)" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 #, fuzzy msgid "(added provide)" msgstr "die Datei »%s« gehört zu keinem Paket\n" @@ -2737,20 +2727,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" @@ -3100,13 +3090,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" @@ -3126,7 +3116,7 @@ msgstr "fehlende { nach %{" #: lib/verify.c:518 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: " #: lib/verify.c:556 diff --git a/po/en_RN.po b/po/en_RN.po index d831683..13f84c1 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-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -596,88 +596,88 @@ msgstr "" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1519 +#: build/files.c:1523 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1678 +#: build/files.c:1682 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1701 +#: build/files.c:1705 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1716 +#: build/files.c:1720 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1778 +#: build/files.c:1782 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2162 +#: build/files.c:2166 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2241 +#: build/files.c:2245 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2325 +#: build/files.c:2329 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2329 +#: build/files.c:2333 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,99 +1410,89 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:114 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:757 +#: lib/depends.c:724 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:778 +#: lib/depends.c:745 msgid "(db files)" msgstr "" -#: lib/depends.c:790 +#: lib/depends.c:757 msgid "(db provides)" msgstr "" -#: lib/depends.c:803 +#: lib/depends.c:770 msgid "(db package)" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:809 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "" @@ -1593,88 +1583,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "" @@ -2183,108 +2173,108 @@ msgstr "" msgid "is needed by" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:276 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:279 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:349 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:415 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:504 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1324 +#: lib/psm.c:1316 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2411,11 +2401,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 msgid "(added files)" msgstr "" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 msgid "(added provide)" msgstr "" @@ -2483,20 +2473,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2825,13 +2815,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -2851,7 +2841,7 @@ msgstr "" #: lib/verify.c:518 #, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "" #: lib/verify.c:556 diff --git a/po/es.po b/po/es.po index d831683..13f84c1 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -596,88 +596,88 @@ msgstr "" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1519 +#: build/files.c:1523 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1678 +#: build/files.c:1682 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1701 +#: build/files.c:1705 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1716 +#: build/files.c:1720 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1778 +#: build/files.c:1782 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2162 +#: build/files.c:2166 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2241 +#: build/files.c:2245 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2325 +#: build/files.c:2329 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2329 +#: build/files.c:2333 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,99 +1410,89 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:114 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:757 +#: lib/depends.c:724 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:778 +#: lib/depends.c:745 msgid "(db files)" msgstr "" -#: lib/depends.c:790 +#: lib/depends.c:757 msgid "(db provides)" msgstr "" -#: lib/depends.c:803 +#: lib/depends.c:770 msgid "(db package)" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:809 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "" @@ -1593,88 +1583,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "" @@ -2183,108 +2173,108 @@ msgstr "" msgid "is needed by" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:276 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:279 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:349 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:415 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:504 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1324 +#: lib/psm.c:1316 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2411,11 +2401,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 msgid "(added files)" msgstr "" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 msgid "(added provide)" msgstr "" @@ -2483,20 +2473,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2825,13 +2815,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -2851,7 +2841,7 @@ msgstr "" #: lib/verify.c:518 #, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "" #: lib/verify.c:556 diff --git a/po/eu_ES.po b/po/eu_ES.po index d831683..13f84c1 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-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -596,88 +596,88 @@ msgstr "" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1519 +#: build/files.c:1523 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1678 +#: build/files.c:1682 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1701 +#: build/files.c:1705 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1716 +#: build/files.c:1720 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1778 +#: build/files.c:1782 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2162 +#: build/files.c:2166 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2241 +#: build/files.c:2245 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2325 +#: build/files.c:2329 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2329 +#: build/files.c:2333 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,99 +1410,89 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:114 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:757 +#: lib/depends.c:724 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:778 +#: lib/depends.c:745 msgid "(db files)" msgstr "" -#: lib/depends.c:790 +#: lib/depends.c:757 msgid "(db provides)" msgstr "" -#: lib/depends.c:803 +#: lib/depends.c:770 msgid "(db package)" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:809 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "" @@ -1593,88 +1583,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "" @@ -2183,108 +2173,108 @@ msgstr "" msgid "is needed by" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:276 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:279 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:349 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:415 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:504 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1324 +#: lib/psm.c:1316 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2411,11 +2401,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 msgid "(added files)" msgstr "" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 msgid "(added provide)" msgstr "" @@ -2483,20 +2473,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2825,13 +2815,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -2851,7 +2841,7 @@ msgstr "" #: lib/verify.c:518 #, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "" #: lib/verify.c:556 diff --git a/po/fi.po b/po/fi.po index 347289e..ffd11ec 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -611,88 +611,88 @@ msgstr "En voi lukea %s: %s." msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1495 +#: build/files.c:1499 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "En voi lukea %s: %s." -#: build/files.c:1519 +#: build/files.c:1523 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Tiedostoa ei löytynyt palvelimelta" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1574 +#: build/files.c:1578 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "en voinut avata %s: %s" -#: build/files.c:1678 +#: build/files.c:1682 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "siirtojen pitää alkaa /-merkillä" -#: build/files.c:1701 +#: build/files.c:1705 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "paketti %s ei ole %s:ssä" -#: build/files.c:1716 +#: build/files.c:1720 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "Tiedostoa ei löytynyt palvelimelta" -#: build/files.c:1778 +#: build/files.c:1782 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, fuzzy, c-format msgid "line: %s\n" msgstr "en voinut avata %s: %s" -#: build/files.c:2162 +#: build/files.c:2166 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "en voinut avata %s: %s" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "En voinut ajaa pgp:tä" -#: build/files.c:2241 +#: build/files.c:2245 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "En voinut ajaa pgp:tä" -#: build/files.c:2325 +#: build/files.c:2329 #, fuzzy, c-format msgid "%s failed\n" msgstr "pgp epäonnistui" -#: build/files.c:2329 +#: build/files.c:2333 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "%s:n luonti epäonnistui\n" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "%s:n luonti epäonnistui\n" -#: build/files.c:2626 +#: build/files.c:2630 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "en voinut avata %s: %s" @@ -835,7 +835,7 @@ msgstr "%s:n kirjoitus ei onnistu" msgid "Could not open %s: %s\n" msgstr "%s:n avaus epäonnistui\n" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "%s:n kirjoitus ei onnistu" @@ -865,7 +865,7 @@ msgstr "%s:n kirjoitus ei onnistu" msgid "Unable to write payload to %s: %s\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1451,104 +1451,94 @@ msgstr "" msgid " failed - " msgstr "pgp epäonnistui" -#: lib/depends.c:114 +#: 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:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, fuzzy, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 #, fuzzy msgid "(rpmrc provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:757 +#: lib/depends.c:724 #, fuzzy msgid "(rpmlib provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:778 +#: lib/depends.c:745 #, fuzzy msgid "(db files)" msgstr "en voinut avata %s: %s" -#: lib/depends.c:790 +#: lib/depends.c:757 #, fuzzy msgid "(db provides)" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:803 +#: lib/depends.c:770 #, fuzzy msgid "(db package)" msgstr "kysele kaikki paketit" -#: lib/depends.c:842 +#: lib/depends.c:809 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" #. Record all relations. -#: lib/depends.c:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "(ei ole luku)" @@ -1641,90 +1631,90 @@ msgstr "en voinut avata tiedostoa %s: " #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "puuttuva '{' '%':n jälkeen" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "puuttuva '{' '%{':n jälkeen" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "tyhjä nimiön formaatti" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "tyhjä nimiön nimi" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "tuntematon nimiö" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "']' puuttuu taulukkomäärittelyn lopusta" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "odottamaton ']'" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "odottamaton '}'" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "odotin '?'-merkkiä ilmauksessa" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 #, fuzzy msgid "{ expected after ? in expression" msgstr "odotin '{' '?'-merkin jälkeen ilmauksessa " #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "odotin '}'-merkkiä ilmauksessa" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "odotin ':' '?'-merkin jälkeen ali-ilmauksessa " #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 #, fuzzy msgid "{ expected after : in expression" msgstr "odotin '{' ':'-merkin jälkeen ilmauksessa " #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "odotin '}'-merkkiä ilmauksen lopussa" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "(tuntematon tyyppi)" @@ -2283,109 +2273,109 @@ msgstr " on ristiriidassa %s-%s-%s:n kanssa\n" msgid "is needed by" msgstr "vaatii %s-%s-%s\n" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:276 +#: lib/psm.c:274 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "Haen: %s\n" -#: lib/psm.c:279 +#: lib/psm.c:277 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/psm.c:349 +#: lib/psm.c:347 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "Haen: %s\n" -#: lib/psm.c:415 +#: lib/psm.c:413 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "Haen: %s\n" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:504 +#: lib/psm.c:502 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1324 +#: lib/psm.c:1316 #, fuzzy msgid "source package contains no .spec file\n" msgstr "kysy pakettia, jonka omistuksessa on" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "älä suorita mitään vaiheita" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "skriptin ajo epäonnistui" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "skriptin ajo epäonnistui" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "paketti %s-%s-%s sisältää jaettuja tiedostoja\n" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp epäonnistui" @@ -2515,12 +2505,12 @@ msgstr "tietuetta %d ei voitu lukea\n" msgid "package %s is not installed\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 #, fuzzy msgid "(added files)" msgstr "en voinut avata %s: %s" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 #, fuzzy msgid "(added provide)" msgstr "tiedostoa %s ei omista mikään paketti\n" @@ -2591,20 +2581,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paketti %s ei ole %s:ssä" @@ -2949,13 +2939,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" @@ -2975,7 +2965,7 @@ msgstr "puuttuva '{' '%':n j #: lib/verify.c:518 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:" #: lib/verify.c:556 diff --git a/po/fr.po b/po/fr.po index 175f33f..f908de2 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -646,88 +646,88 @@ msgstr "impossible d'ouvrir: %s\n" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1519 +#: build/files.c:1523 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1678 +#: build/files.c:1682 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "les arguments de --root (-r) doivent commencer par un /" -#: build/files.c:1701 +#: build/files.c:1705 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1716 +#: build/files.c:1720 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: build/files.c:1778 +#: build/files.c:1782 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, fuzzy, c-format msgid "line: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:2162 +#: build/files.c:2166 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "impossible d'ouvrir: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:2241 +#: build/files.c:2245 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:2325 +#: build/files.c:2329 #, fuzzy, c-format msgid "%s failed\n" msgstr "La construction a chou.\n" -#: build/files.c:2329 +#: build/files.c:2333 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -870,7 +870,7 @@ msgstr "impossible d'ouvrir: %s\n" msgid "Could not open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -900,7 +900,7 @@ msgstr "impossible d'ouvrir: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1491,101 +1491,91 @@ msgstr "" msgid " failed - " msgstr "La construction a chou.\n" -#: lib/depends.c:114 +#: lib/depends.c:112 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/depends.c:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, fuzzy, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:757 +#: lib/depends.c:724 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:778 +#: lib/depends.c:745 #, fuzzy msgid "(db files)" msgstr "impossible d'ouvrir: %s\n" -#: lib/depends.c:790 +#: lib/depends.c:757 msgid "(db provides)" msgstr "" -#: lib/depends.c:803 +#: lib/depends.c:770 #, fuzzy msgid "(db package)" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/depends.c:842 +#: lib/depends.c:809 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "impossible d'ouvrir: %s\n" #. Record all relations. -#: lib/depends.c:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "" @@ -1676,90 +1666,90 @@ msgstr "impossible d'ouvrir: %s\n" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 #, fuzzy msgid "unexpected ]" msgstr "source de requte inattendue" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 #, fuzzy msgid "unexpected }" msgstr "source de requte inattendue" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "" @@ -2331,110 +2321,110 @@ msgstr "" msgid "is needed by" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:276 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:279 +#: lib/psm.c:277 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:349 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:415 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:504 +#: lib/psm.c:502 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1324 +#: lib/psm.c:1316 #, fuzzy msgid "source package contains no .spec file\n" msgstr "" " -f + - interroge le package qui appartient " -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "La construction a chou.\n" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "La construction a chou.\n" @@ -2564,12 +2554,12 @@ msgstr "" msgid "package %s is not installed\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 #, fuzzy msgid "(added files)" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 msgid "(added provide)" msgstr "" @@ -2638,20 +2628,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -2992,13 +2982,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -3018,7 +3008,7 @@ msgstr "" #: lib/verify.c:518 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "impossible d'ouvrir: %s\n" #: lib/verify.c:556 diff --git a/po/gl.po b/po/gl.po index a779486..16db9ab 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -591,88 +591,88 @@ msgstr "" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1519 +#: build/files.c:1523 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1678 +#: build/files.c:1682 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1701 +#: build/files.c:1705 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1716 +#: build/files.c:1720 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1778 +#: build/files.c:1782 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2162 +#: build/files.c:2166 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2241 +#: build/files.c:2245 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2325 +#: build/files.c:2329 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2329 +#: build/files.c:2333 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -811,7 +811,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -841,7 +841,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1405,99 +1405,89 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:114 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:757 +#: lib/depends.c:724 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:778 +#: lib/depends.c:745 msgid "(db files)" msgstr "" -#: lib/depends.c:790 +#: lib/depends.c:757 msgid "(db provides)" msgstr "" -#: lib/depends.c:803 +#: lib/depends.c:770 msgid "(db package)" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:809 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "" @@ -1588,88 +1578,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "" @@ -2178,108 +2168,108 @@ msgstr "" msgid "is needed by" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:276 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:279 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:349 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:415 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:504 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1324 +#: lib/psm.c:1316 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2406,11 +2396,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 msgid "(added files)" msgstr "" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 msgid "(added provide)" msgstr "" @@ -2478,20 +2468,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2820,13 +2810,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -2846,7 +2836,7 @@ msgstr "" #: lib/verify.c:518 #, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "" #: lib/verify.c:556 diff --git a/po/hu.po b/po/hu.po index d831683..13f84c1 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -596,88 +596,88 @@ msgstr "" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1519 +#: build/files.c:1523 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1678 +#: build/files.c:1682 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1701 +#: build/files.c:1705 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1716 +#: build/files.c:1720 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1778 +#: build/files.c:1782 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2162 +#: build/files.c:2166 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2241 +#: build/files.c:2245 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2325 +#: build/files.c:2329 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2329 +#: build/files.c:2333 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,99 +1410,89 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:114 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:757 +#: lib/depends.c:724 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:778 +#: lib/depends.c:745 msgid "(db files)" msgstr "" -#: lib/depends.c:790 +#: lib/depends.c:757 msgid "(db provides)" msgstr "" -#: lib/depends.c:803 +#: lib/depends.c:770 msgid "(db package)" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:809 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "" @@ -1593,88 +1583,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "" @@ -2183,108 +2173,108 @@ msgstr "" msgid "is needed by" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:276 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:279 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:349 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:415 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:504 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1324 +#: lib/psm.c:1316 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2411,11 +2401,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 msgid "(added files)" msgstr "" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 msgid "(added provide)" msgstr "" @@ -2483,20 +2473,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2825,13 +2815,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -2851,7 +2841,7 @@ msgstr "" #: lib/verify.c:518 #, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "" #: lib/verify.c:556 diff --git a/po/id.po b/po/id.po index d831683..13f84c1 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -596,88 +596,88 @@ msgstr "" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1519 +#: build/files.c:1523 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1678 +#: build/files.c:1682 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1701 +#: build/files.c:1705 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1716 +#: build/files.c:1720 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1778 +#: build/files.c:1782 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2162 +#: build/files.c:2166 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2241 +#: build/files.c:2245 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2325 +#: build/files.c:2329 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2329 +#: build/files.c:2333 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,99 +1410,89 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:114 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:757 +#: lib/depends.c:724 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:778 +#: lib/depends.c:745 msgid "(db files)" msgstr "" -#: lib/depends.c:790 +#: lib/depends.c:757 msgid "(db provides)" msgstr "" -#: lib/depends.c:803 +#: lib/depends.c:770 msgid "(db package)" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:809 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "" @@ -1593,88 +1583,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "" @@ -2183,108 +2173,108 @@ msgstr "" msgid "is needed by" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:276 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:279 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:349 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:415 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:504 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1324 +#: lib/psm.c:1316 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2411,11 +2401,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 msgid "(added files)" msgstr "" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 msgid "(added provide)" msgstr "" @@ -2483,20 +2473,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2825,13 +2815,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -2851,7 +2841,7 @@ msgstr "" #: lib/verify.c:518 #, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "" #: lib/verify.c:556 diff --git a/po/is.po b/po/is.po index d9383aa..cf41c18 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -591,88 +591,88 @@ msgstr "Skr msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1519 +#: build/files.c:1523 #, c-format msgid "File not found: %s\n" msgstr "Skráin fannst ekki: %s\n" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1678 +#: build/files.c:1682 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1701 +#: build/files.c:1705 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "Gat ekki opnað PreUn skrá: %s\n" -#: build/files.c:1716 +#: build/files.c:1720 #, c-format msgid "File not found by glob: %s\n" msgstr "Skráin fannst ekki með 'glob': %s\n" -#: build/files.c:1778 +#: build/files.c:1782 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Gat ekki opnað %%files skrána %s: %s\n" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "lína: %s\n" -#: build/files.c:2162 +#: build/files.c:2166 #, c-format msgid "Bad file: %s: %s\n" msgstr "Ógild skrá %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "Gat ekki keyrt %s: %s\n" -#: build/files.c:2241 +#: build/files.c:2245 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "Gat ekki búið til undirferli (fork) %s: %s\n" -#: build/files.c:2325 +#: build/files.c:2329 #, c-format msgid "%s failed\n" msgstr "%s brást\n" -#: build/files.c:2329 +#: build/files.c:2333 #, c-format msgid "failed to write all data to %s\n" msgstr "gat ekki ritað öll gögn í %s\n" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, c-format msgid "Failed to find %s:\n" msgstr "gat ekki fundið %s:\n" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -815,7 +815,7 @@ msgstr "Get ekki lesi msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, c-format msgid "Unable to write package: %s\n" msgstr "Get ekki ritað í pakka: %s\n" @@ -845,7 +845,7 @@ msgstr "Get ekki lesi msgid "Unable to write payload to %s: %s\n" msgstr "Get ekki ritað innihald í %s: %s\n" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "Skrifaði: %s\n" @@ -1410,100 +1410,90 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:114 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "get ekki opnað pakka gagnagrunn í\n" -#: lib/depends.c:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:757 +#: lib/depends.c:724 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:778 +#: lib/depends.c:745 msgid "(db files)" msgstr "" -#: lib/depends.c:790 +#: lib/depends.c:757 msgid "(db provides)" msgstr "" -#: lib/depends.c:803 +#: lib/depends.c:770 #, fuzzy msgid "(db package)" msgstr "uppfæra pakka" -#: lib/depends.c:842 +#: lib/depends.c:809 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "" @@ -1594,88 +1584,88 @@ msgstr "%s b #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "" @@ -2189,108 +2179,108 @@ msgstr "" msgid "is needed by" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:276 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:279 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d færa %s -> %s\n" -#: lib/psm.c:349 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:415 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:504 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "gat ekki búið til %%%s %s\n" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "get ekki ritað í %%%s %s\n" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1324 +#: lib/psm.c:1316 msgid "source package contains no .spec file\n" msgstr "pakkinn inniheldur enga .spec skrá\n" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "gat ekki opnað %s: %s\n" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s brást\n" @@ -2417,11 +2407,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 msgid "(added files)" msgstr "" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 msgid "(added provide)" msgstr "" @@ -2489,20 +2479,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2831,13 +2821,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -2857,7 +2847,7 @@ msgstr "vantar %s" #: lib/verify.c:518 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "Óuppfyllt pakkaskilyrði fyrir %s-%s-%s: " #: lib/verify.c:556 diff --git a/po/it.po b/po/it.po index d831683..13f84c1 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -596,88 +596,88 @@ msgstr "" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1519 +#: build/files.c:1523 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1678 +#: build/files.c:1682 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1701 +#: build/files.c:1705 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1716 +#: build/files.c:1720 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1778 +#: build/files.c:1782 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2162 +#: build/files.c:2166 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2241 +#: build/files.c:2245 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2325 +#: build/files.c:2329 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2329 +#: build/files.c:2333 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,99 +1410,89 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:114 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:757 +#: lib/depends.c:724 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:778 +#: lib/depends.c:745 msgid "(db files)" msgstr "" -#: lib/depends.c:790 +#: lib/depends.c:757 msgid "(db provides)" msgstr "" -#: lib/depends.c:803 +#: lib/depends.c:770 msgid "(db package)" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:809 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "" @@ -1593,88 +1583,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "" @@ -2183,108 +2173,108 @@ msgstr "" msgid "is needed by" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:276 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:279 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:349 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:415 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:504 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1324 +#: lib/psm.c:1316 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2411,11 +2401,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 msgid "(added files)" msgstr "" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 msgid "(added provide)" msgstr "" @@ -2483,20 +2473,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2825,13 +2815,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -2851,7 +2841,7 @@ msgstr "" #: lib/verify.c:518 #, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "" #: lib/verify.c:556 diff --git a/po/ja.po b/po/ja.po index dce7261..3d606b3 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -637,88 +637,88 @@ msgstr " msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1495 +#: build/files.c:1499 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "¥Õ¥¡¥¤¥ë¤Ï prefix (%s) ¤È°ìÃפ·¤Þ¤»¤ó: %s" -#: build/files.c:1519 +#: build/files.c:1523 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "ÉÔÀµ¤Ê½êÍ­¼Ô/¥°¥ë¡¼¥×: %s\n" -#: build/files.c:1574 +#: build/files.c:1578 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "¥Õ¥¡¥¤¥ë %4d: %07o %s.%s\t %s\n" -#: build/files.c:1678 +#: build/files.c:1682 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "¥Õ¥¡¥¤¥ë¤ÏÀèƬ¤Ë \"/\" ¤¬É¬ÍפǤ¹: %s" -#: build/files.c:1701 +#: build/files.c:1705 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "%d ¹ÔÌÜ: ¥Ð¡¼¥¸¥ç¥ó¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s" -#: build/files.c:1716 +#: build/files.c:1720 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó(by glob): %s" -#: build/files.c:1778 +#: build/files.c:1782 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "%%files ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, fuzzy, c-format msgid "line: %s\n" msgstr "¹ÔÌÜ: %s" -#: build/files.c:2162 +#: build/files.c:2166 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "%s ¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s" -#: build/files.c:2241 +#: build/files.c:2245 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "%s ¤ò fork ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s" -#: build/files.c:2325 +#: build/files.c:2329 #, fuzzy, c-format msgid "%s failed\n" msgstr "%s ¼ºÇÔ" -#: build/files.c:2329 +#: build/files.c:2333 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "Á´¤Æ¤Î¥Ç¡¼¥¿¤ò %s ¤Ë½ñ¤¯¤³¤È¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: build/files.c:2465 +#: build/files.c:2469 #, fuzzy, c-format msgid "Finding %s: (using %s)...\n" msgstr "%s ¤òõ¤·¤Æ¤¤¤Þ¤¹: (%s ¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹)...\n" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "%s ¤ò¸«¤Ä¤±¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿:" -#: build/files.c:2626 +#: build/files.c:2630 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "¥Õ¥¡¥¤¥ë¤Î½èÍýÃæ: %s-%s-%s\n" @@ -862,7 +862,7 @@ msgstr " msgid "Could not open %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" @@ -892,7 +892,7 @@ msgstr " msgid "Unable to write payload to %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "½ñ¤­¹þ¤ßÃæ: %s\n" @@ -1483,104 +1483,94 @@ msgstr "" msgid " failed - " msgstr "¼ºÇÔ - " -#: lib/depends.c:114 +#: lib/depends.c:112 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" -#: lib/depends.c:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, fuzzy, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:757 +#: lib/depends.c:724 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:778 +#: lib/depends.c:745 #, fuzzy msgid "(db files)" msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" -#: lib/depends.c:790 +#: lib/depends.c:757 #, fuzzy msgid "(db provides)" msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:803 +#: lib/depends.c:770 #, fuzzy msgid "(db package)" msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Þ¤·¤¿\n" -#: lib/depends.c:842 +#: lib/depends.c:809 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" #. Record all relations. -#: lib/depends.c:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "(¿ô»ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)" @@ -1673,89 +1663,89 @@ msgstr " #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 #, fuzzy msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabDate() RPM_STRING_TYPE ¥«¥¦¥ó¥È¤Ï 1 ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "¥Ç¡¼¥¿¥¿¥¤¥× %d ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "% ¤Î¸å¤Ë { ¤¬¤¢¤ê¤Þ¤»¤ó" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "%{ ¤Î¸å¤Ë } ¤¬¤¢¤ê¤Þ¤»¤ó" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "¶õ¤Î¥¿¥°¥Õ¥©¡¼¥Þ¥Ã¥È" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "¶õ¤Î¥¿¥°Ì¾" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "ÉÔÌÀ¤Ê¥¿¥°" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "ÇÛÎó¤Î¸å¤Ë ] ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "ͽ´ü¤»¤Ì ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "ͽ´ü¤»¤Ì }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "¼°Ãæ¤Ç ? ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "¼°Ãæ¤Ç ? ¤Î¸å¤Ë { ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "¼°Ãæ¤Ë } ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "°Ê²¼¤Î ? ¥µ¥Ö¼°¤Î ¤Ë: ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "¼°Ãæ¤Ç : ¤Î¸å¤Ë { ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "¼°¤Î½ª¤ê¤Ë | ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "(ÉÔÌÀ¤Ê¥¿¥¤¥×)" @@ -2341,111 +2331,111 @@ msgstr " %s-%s-%s msgid "is needed by" msgstr "¤Ï %s-%s-%s ¤ËɬÍפȤµ¤ì¤Æ¤¤¤Þ¤¹\n" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:276 +#: lib/psm.c:274 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "OS ¤Ï½ü³°¤µ¤ì¤Æ¤¤¤Þ¤¹: %s" -#: lib/psm.c:279 +#: lib/psm.c:277 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "%s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n" -#: lib/psm.c:349 +#: lib/psm.c:347 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "¥Õ¥¡¥¤¥ë¤Î½ü³°: %s%s\n" -#: lib/psm.c:415 +#: lib/psm.c:413 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "¥Õ¥¡¥¤¥ë¤Î½ü³°: %s%s\n" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "%s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n" -#: lib/psm.c:504 +#: lib/psm.c:502 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "%s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "%s ¤Ø½ñ¤­¹þ¤á¤Þ¤»¤ó" -#: lib/psm.c:1200 +#: lib/psm.c:1197 #, fuzzy msgid "source package expected, binary found\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Þ¤¹¡¢¥Ð¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Þ¤·¤¿" -#: lib/psm.c:1324 +#: lib/psm.c:1316 #, fuzzy msgid "source package contains no .spec file\n" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "¥Ý¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "¥æ¡¼¥¶ %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "¥°¥ë¡¼¥× %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿­Ä¹¤Ë¼ºÇÔ %s%s: %s" -#: lib/psm.c:2233 +#: lib/psm.c:2225 #, fuzzy msgid " on file " msgstr "¥Õ¥¡¥¤¥ë¾å" -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s ¼ºÇÔ" @@ -2574,12 +2564,12 @@ msgstr " msgid "package %s is not installed\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 #, fuzzy msgid "(added files)" msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 #, fuzzy msgid "(added provide)" msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n" @@ -2650,7 +2640,7 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2659,13 +2649,13 @@ msgstr "" "\"B\" ¤Î°Í¸À­¤Ï epoch ¤òɬÍפȤ·¤Þ¤¹(\"A\"¤ÈƱ¤¸¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n" @@ -3009,13 +2999,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "½ð̾¥Ñ¥Ã¥É: %d\n" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n" @@ -3041,7 +3031,7 @@ msgstr "%s #: lib/verify.c:518 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À­¤òËþ¤¿¤·¤Æ¤¤¤Þ¤»¤ó:" #: lib/verify.c:556 diff --git a/po/ko.po b/po/ko.po index 2ef98ad..1412a50 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: 2001-09-07 22:03+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -602,88 +602,88 @@ msgstr " msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "BuildRoot¿¡ ½Éº¼¸¯¸µÅ©ÇÔ: %s -> %s\n" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "ÆÄÀÏÀÌ prefix (%s) (¿Í)°ú ÀÏÄ¡ÇÏÁö ¾ÊÀ½: %s\n" -#: build/files.c:1519 +#: build/files.c:1523 #, c-format msgid "File not found: %s\n" msgstr "ÆÄÀÏÀ» ãÀ» ¼ö ¾øÀ½: %s\n" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "À߸øµÈ ¼ÒÀ¯ÀÚ/±×·ì: %s\n" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "ÆÄÀÏ %4d: %07o %s.%s\t %s\n" -#: build/files.c:1678 +#: build/files.c:1682 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "ÆÄÀÏÀº \"/\" ·Î ½ÃÀÛÇؾßÇÔ: %s\n" -#: build/files.c:1701 +#: build/files.c:1705 #, c-format msgid "Glob not permitted: %s\n" msgstr "GlobÀ» »ç¿ëÇÒ ¼ö ¾øÀ½: %s\n" -#: build/files.c:1716 +#: build/files.c:1720 #, c-format msgid "File not found by glob: %s\n" msgstr "globÀ¸·Î ÆÄÀÏÀ» ãÀ» ¼ö ¾øÀ½: %s\n" -#: build/files.c:1778 +#: build/files.c:1782 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "%s ÆÄÀÏÀÇ %%files¸¦ ¿­ ¼ö ¾øÀ½: %s\n" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "ÁÙ(line): %s\n" -#: build/files.c:2162 +#: build/files.c:2166 #, c-format msgid "Bad file: %s: %s\n" msgstr "À߸øµÈ ÆÄÀÏ: %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "%s (À»)¸¦ ½ÇÇàÇÒ ¼ö ¾øÀ½: %s\n" -#: build/files.c:2241 +#: build/files.c:2245 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "%s (À»)¸¦ fork ÇÒ ¼ö ¾øÀ½: %s\n" -#: build/files.c:2325 +#: build/files.c:2329 #, c-format msgid "%s failed\n" msgstr "%s (ÀÌ)°¡ ½ÇÆÐÇß½À´Ï´Ù\n" -#: build/files.c:2329 +#: build/files.c:2333 #, c-format msgid "failed to write all data to %s\n" msgstr "%s ¿¡ ¸ðµç ÀڷḦ ±â·ÏÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "%s (À»)¸¦ ã´Â Áß: (%s »ç¿ë)...\n" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, c-format msgid "Failed to find %s:\n" msgstr "%s (À»)¸¦ ã´Âµ¥ ½ÇÆÐÇÔ:\n" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "ÆÄÀÏ Ã³¸® Áß: %s-%s-%s\n" @@ -822,7 +822,7 @@ msgstr " msgid "Could not open %s: %s\n" msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, c-format msgid "Unable to write package: %s\n" msgstr "ÆÐÅ°Áö¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n" @@ -852,7 +852,7 @@ msgstr "%s msgid "Unable to write payload to %s: %s\n" msgstr "%s ¿¡ payload¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "ÀÛ¼º: %s\n" @@ -1423,105 +1423,95 @@ msgstr " msgid " failed - " msgstr " ½ÇÆÐÇÔ - " -#: lib/depends.c:114 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "%s ¾ÈÀÇ ÆÐÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/depends.c:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, fuzzy, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "%s ÆÐÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s ¿¹ (rpmrcÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:757 +#: lib/depends.c:724 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s ¿¹ (rpmlibÀÌ Á¦°øÇÔ)\n" -#: lib/depends.c:778 +#: lib/depends.c:745 #, fuzzy msgid "(db files)" msgstr "À߸øµÈ db ÆÄÀÏ %s\n" -#: lib/depends.c:790 +#: lib/depends.c:757 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n" -#: lib/depends.c:803 +#: lib/depends.c:770 #, fuzzy msgid "(db package)" msgstr "ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/depends.c:842 +#: lib/depends.c:809 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) ÀÇÁ¸(Depends) ij½Ã¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù.\n" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "¾Æ´Ï¿À" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "¿¹" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort °ü°è¿¡¼­ %s-%s-%s \"%s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" #. Record all relations. -#: lib/depends.c:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== ÆÐÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼­, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, ±íÀÌ[depth])\n" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "========== ÈÄÀÓÀÚ [successors only] (Ç¥Çö ¼ø)\n" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "·çÇÁ(LOOP):\n" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "(¼ýÀÚ°¡ ¾Æ´Õ´Ï´Ù)" @@ -1615,88 +1605,88 @@ msgstr "%s ( #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE Ä«¿îÆ®´Â ¹Ýµå½Ã '1' À̾î¾ß ÇÕ´Ï´Ù.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "%d µ¥ÀÌÅÍ À¯ÇüÀº »ç¿ëÇÏ½Ç ¼ö ¾ø½À´Ï´Ù\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "'%' µÚ¿¡ '{' ¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "'%{' µÚ¿¡ '}' ¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "ÅÂ±× Çü½ÄÀÌ ºñ¾îÀÖ½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "ÅÂ±× À̸§ÀÌ ºñ¾îÀÖ½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "¾Ë ¼ö ¾ø´Â ÅÂ±× ÀÔ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "¹è¿­ÀÇ ³¡ºÎºÐ¿¡ ']' °¡ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "ºÒÇÊ¿äÇÑ ']' °¡ »ç¿ëµÇ°í ÀÖ½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "ºÒÇÊ¿äÇÑ '}' °¡ »ç¿ëµÇ°í ÀÖ½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "Ç¥Çö½Ä¿¡ '?' °¡ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "Ç¥Çö½Ä¿¡¼­ '?' µÚ¿¡ '{' °¡ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "Ç¥Çö½Ä¿¡ '}' °¡ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "ÇϺΠǥÇö½Ä(subexpression)ÀÇ '?' ´ÙÀ½¿¡ ':' ÀÌ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "Ç¥Çö½Ä¿¡¼­ ':' µÚ¿¡ '{' °¡ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "Ç¥Çö½ÄÀÇ ³¡ºÎºÐ¿¡ '|' °¡ ÇÊ¿äÇÕ´Ï´Ù" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "(¾Ë ¼ö ¾ø´Â À¯Çü)" @@ -2230,114 +2220,114 @@ msgstr " %s-%s-%s ( msgid "is needed by" msgstr " (Àº)´Â %s-%s-%s ¿¡¼­ ÇÊ¿ä·Î ÇÕ´Ï´Ù\n" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "========== Àç¹èÄ¡\n" -#: lib/psm.c:276 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "%5d Á¦¿Ü(exclude) %s\n" -#: lib/psm.c:279 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d Àç¹èÄ¡ %s -> %s\n" -#: lib/psm.c:349 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "%s%s multilib °æ·Î¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" -#: lib/psm.c:415 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "%s %s (À»)¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "%s ¿¡¼­ %s (À¸)·Î Àç¹èÄ¡ ÇÕ´Ï´Ù\n" -#: lib/psm.c:504 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "%s µð·ºÅ丮¸¦ %s (À¸)·Î Àç¹èÄ¡ ÇÕ´Ï´Ù\n" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "%%%s %s (À»)¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "%%%s %s (À»)¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "¼Ò½º ÆÐÅ°Áö°¡ ¿ä±¸µË´Ï´Ù, ¹ÙÀ̳ʸ®¸¦ ã¾Ò½À´Ï´Ù\n" -#: lib/psm.c:1324 +#: lib/psm.c:1316 msgid "source package contains no .spec file\n" msgstr "¼Ò½º ÆÐÅ°Áö¿¡ .spec ÆÄÀÏÀÌ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: %s ½ºÅ©¸³Æ®¸¦ ½ÇÇàÇÕ´Ï´Ù (ÀÖÀ» °æ¿ì)\n" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" "%2$s-%3$s-%4$s ÀÇ %1$s ½ºÅ©¸³Æ®¸´(scriptlet) ½ÇÇà¿¡ ½ÇÆÐÇß½À´Ï´Ù, waitpid°¡ %" "5$s (À»)¸¦ ¹ÝȯÇÏ¿´½À´Ï´Ù \n" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" "%2$s-%3$s-%4$s ÀÇ %1$s ½ºÅ©¸³Æ®¸´(scriptlet) ½ÇÇà¿¡ ½ÇÆÐÇß½À´Ï´Ù, Á¾·á »óȲ %" "5$d\n" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s (ÀÌ)°¡ %d ÀÇ ÆÄÀÏÀ» °®°í ÀÖ½À´Ï´Ù, Å×½ºÆ® = %d\n" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" "%s: %s ½ºÅ©¸³Æ®¸´(scriptlet)°¡ ½ÇÆÐÇß½À´Ï´Ù (%d), %s-%s-%s (À»)¸¦ »ý·«ÇÕ´Ï" "´Ù\n" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "%s »ç¿ëÀÚ°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "%s ±×·ìÀÌ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¾ÆÄ«À̺긦 Ǫ´Âµ¥ ½ÇÆÐÇÔ%s%s: %s\n" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr " ´ÙÀ½ ÆÄÀÏ¿¡ " -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%2$s ÆÄÀÏÀÇ %1$s (ÀÌ)°¡ ½ÇÆÐÇÔ: %3$s\n" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, c-format msgid "%s failed: %s\n" msgstr "%s (ÀÌ)°¡ ½ÇÆÐÇÔ: %s\n" @@ -2464,12 +2454,12 @@ msgstr " msgid "package %s is not installed\n" msgstr "%s ÆÐÅ°Áö´Â ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 #, fuzzy msgid "(added files)" msgstr "À߸øµÈ db ÆÄÀÏ %s\n" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n" @@ -2538,7 +2528,7 @@ msgid "OK" msgstr "È®ÀÎ" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2547,13 +2537,13 @@ msgstr "" "\"B\" ÀÇÁ¸¼ºÀº Áß¿ä½Ã µÇ´Â °Í(epoch)À» ÇÊ¿ä·Î ÇÕ´Ï´Ù (\"A\" ·Î °¡Á¤ÇÕ´Ï´Ù)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "%s-%s-%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n" @@ -2885,13 +2875,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "¼­¸í: size(%d)+pad(%d)\n" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "missingok Ç÷¡±×·Î ÀÎÇØ %s (À»)¸¦ »ý·«ÇÕ´Ï´Ù\n" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "%s µð·ºÅ丮¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n" @@ -2913,7 +2903,7 @@ msgstr " #: lib/verify.c:518 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "%s-%s-%s ¿¡ ÀÇÁ¸¼º ¹®Á¦ ¹ß»ý: " #: lib/verify.c:556 diff --git a/po/no.po b/po/no.po index 2d43a77..bc168b0 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -601,88 +601,88 @@ msgstr "Fil listet to ganger: %s\n" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Symbolsk lenke peker til BuildRoot: %s -> %s\n" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1519 +#: build/files.c:1523 #, c-format msgid "File not found: %s\n" msgstr "Fil ikke funnet: %s\n" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Ugyldig eier/gruppe: %s\n" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1678 +#: build/files.c:1682 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1701 +#: build/files.c:1705 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "linje %d: Filnavn ikke tillatt: %s\n" -#: build/files.c:1716 +#: build/files.c:1720 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1778 +#: build/files.c:1782 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "Installerer %s\n" -#: build/files.c:2162 +#: build/files.c:2166 #, c-format msgid "Bad file: %s: %s\n" msgstr "Ugyldig fil %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "Kunne ikke kjøre %s: %s\n" -#: build/files.c:2241 +#: build/files.c:2245 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "klarte ikke å åpne %s: %s\n" -#: build/files.c:2325 +#: build/files.c:2329 #, c-format msgid "%s failed\n" msgstr "%s feilet\n" -#: build/files.c:2329 +#: build/files.c:2333 #, c-format msgid "failed to write all data to %s\n" msgstr "kunne ikke skrive alle data til %s\n" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, c-format msgid "Failed to find %s:\n" msgstr "Klarte ikke å finne %s:\n" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -825,7 +825,7 @@ msgstr "Kunne ikke msgid "Could not open %s: %s\n" msgstr "Kunne ikke åpne %s: %s\n" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunne ikke skrive pakke: %s\n" @@ -855,7 +855,7 @@ msgstr "Kunne ikke lese \"payload\" fra %s: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "Kunne ikke skrive \"payload\" til %s: %s\n" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1424,100 +1424,90 @@ msgstr "" msgid " failed - " msgstr " feilet - " -#: lib/depends.c:114 +#: 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:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, fuzzy, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "pakke %s er allerede installert" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:757 +#: lib/depends.c:724 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:778 +#: lib/depends.c:745 msgid "(db files)" msgstr "" -#: lib/depends.c:790 +#: lib/depends.c:757 msgid "(db provides)" msgstr "" -#: lib/depends.c:803 +#: lib/depends.c:770 #, fuzzy msgid "(db package)" msgstr "ingen pakker\n" -#: lib/depends.c:842 +#: lib/depends.c:809 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "NEI" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "JA" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "" @@ -1608,88 +1598,88 @@ msgstr "%s opprettet som %s\n" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "Datatype %d ikke støttet\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "mangler { etter %" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "mangler } etter %{" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "(ukjent type)" @@ -2213,108 +2203,108 @@ msgstr " er i konflikt med %s-%s-%s\n" msgid "is needed by" msgstr " kreves av %s-%s-%s\n" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:276 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:279 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d omplasser %s -> %s\n" -#: lib/psm.c:349 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "ekskluderer multilib-sti %s%s\n" -#: lib/psm.c:415 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "eksluderer %s %s\n" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "relokerer %s til %s\n" -#: lib/psm.c:504 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "relokerer katalog %s til %s\n" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "kan ikke opprette %%%s %s\n" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "kan ikke skrive til %%%s %s\n" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "kildepakke forventet, binær funnet\n" -#: lib/psm.c:1324 +#: lib/psm.c:1316 msgid "source package contains no .spec file\n" msgstr "kildepakke inneholder ikke en .spec-fil\n" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: kjører %s-skript (hvis noen)\n" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "klarte ikke å åpne %s: %s\n" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s feilet\n" @@ -2441,11 +2431,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "pakke %s er ikke installert\n" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 msgid "(added files)" msgstr "" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 msgid "(added provide)" msgstr "" @@ -2513,20 +2503,20 @@ msgid "OK" msgstr "OK" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "pakke %s er i konflikt: %s\n" @@ -2857,13 +2847,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "ekskluderer katalog %s\n" @@ -2883,7 +2873,7 @@ msgstr "mangler %s" #: lib/verify.c:518 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "feilede avhengigheter:\n" #: lib/verify.c:556 diff --git a/po/pl.po b/po/pl.po index a222266..2a336c4 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -627,88 +627,88 @@ msgstr "Plik podany dwukrotnie: %s" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1495 +#: build/files.c:1499 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Plik nie zgadza siê z prefiksem (%s): %s" -#: build/files.c:1519 +#: build/files.c:1523 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Nie znaleziono pliku: %s" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "B³êdny u¿ytkownik/grupa: %s\n" -#: build/files.c:1574 +#: build/files.c:1578 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "Plik %4d: 0%o %s.%s\t %s\n" -#: build/files.c:1678 +#: build/files.c:1682 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "Plik musi siê zaczynaæ od \"/\": %s" -#: build/files.c:1701 +#: build/files.c:1705 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "linia %d: Wersja niedozwolona: %s" -#: build/files.c:1716 +#: build/files.c:1720 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "Nie znaleziono pliku: %s" -#: build/files.c:1778 +#: build/files.c:1782 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Nie mo¿na otworzyæ %%files pliku: %s" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, fuzzy, c-format msgid "line: %s\n" msgstr "linia: %s" -#: build/files.c:2162 +#: build/files.c:2166 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "plik %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "Nie mo¿na uruchomiæ %s" -#: build/files.c:2241 +#: build/files.c:2245 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "Nie mo¿na wykonaæ fork na %s" -#: build/files.c:2325 +#: build/files.c:2329 #, fuzzy, c-format msgid "%s failed\n" msgstr "%s nie powiod³o siê" -#: build/files.c:2329 +#: build/files.c:2333 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "zapisanie wszystkich danych do %s nie powiod³o siê" -#: build/files.c:2465 +#: build/files.c:2469 #, fuzzy, c-format msgid "Finding %s: (using %s)...\n" msgstr "Wyszukiwanie wymaganych zasobów...\n" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "Wyszukiwanie nie powiod³o siê" -#: build/files.c:2626 +#: build/files.c:2630 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Przetwarzanie plików: %s\n" @@ -852,7 +852,7 @@ msgstr "Nie mo msgid "Could not open %s: %s\n" msgstr "Nie mo¿na otworzyæ %s\n" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nie mo¿na zapisaæ pakietu: %s" @@ -882,7 +882,7 @@ msgstr "Nie mo msgid "Unable to write payload to %s: %s\n" msgstr "Nie mo¿na zapisaæ pakietu: %s" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -1465,105 +1465,95 @@ msgstr "" msgid " failed - " msgstr " nie powiod³o siê -" -#: lib/depends.c:114 +#: 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:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, fuzzy, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 #, fuzzy msgid "(rpmrc provides)" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:757 +#: lib/depends.c:724 #, fuzzy msgid "(rpmlib provides)" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/depends.c:778 +#: lib/depends.c:745 #, fuzzy msgid "(db files)" msgstr "b³êdny status pliku: %s" -#: lib/depends.c:790 +#: lib/depends.c:757 #, fuzzy msgid "(db provides)" msgstr "Udostêpniane zasoby:" -#: lib/depends.c:803 +#: lib/depends.c:770 #, fuzzy msgid "(db package)" msgstr "znaleziono %d pakietów\n" -#: lib/depends.c:842 +#: lib/depends.c:809 #, 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:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 #, fuzzy msgid "NO " msgstr "NIE DOBRZE" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "usuwanie indeksu grupy\n" #. Record all relations. -#: lib/depends.c:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "(nie jest liczb±)" @@ -1656,89 +1646,89 @@ msgstr "ostrze #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 #, fuzzy msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabData() RPM_STRING_TYPE licznik musi byæ 1.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "Typ danych %d nie jest obs³ugiwany\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "brak { po %" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "brak } po %{" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "pusty format etykiety" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "pusta nazwa etykiety" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "nieznana etykieta" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "spodziewany ] na koñcu tablicy" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "nie spodziewany ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "nie spodziewany }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "spodziewany ? w wyra¿eniu" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "spodziewany { po ? w wyra¿eniu" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "spodziewany } w wyra¿eniu" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "spodziewany : po podwyra¿eniu ?" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "spodziewany { po : w wyra¿eniu" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "spodziewany | na koñcu wyra¿enia" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "(nieznany typ)" @@ -2299,110 +2289,110 @@ msgstr " jest w konflikcie z %s-%s-%s\n" msgid "is needed by" msgstr " jest wymagany przez %s-%s-%s\n" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:276 +#: lib/psm.c:274 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "Ten OS nie jest wspierany: %s" -#: lib/psm.c:279 +#: lib/psm.c:277 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "przesuwanie %s do %s\n" -#: lib/psm.c:349 +#: lib/psm.c:347 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "wy³±czanie %s\n" -#: lib/psm.c:415 +#: lib/psm.c:413 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "wy³±czanie %s\n" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "przesuwanie %s do %s\n" -#: lib/psm.c:504 +#: lib/psm.c:502 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "przesuwanie %s do %s\n" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "nie mo¿na utworzyæ %s" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "nie mo¿na zapisaæ do %s" -#: lib/psm.c:1200 +#: lib/psm.c:1197 #, fuzzy msgid "source package expected, binary found\n" msgstr "spodziewany pakiet ¼ród³owy a nie binarny" -#: lib/psm.c:1324 +#: lib/psm.c:1316 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pakiet ¼ród³owy nie zawiera pliku .spec" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "wykonanie skryptu nie powiod³o siê" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "wykonanie skryptu nie powiod³o siê" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "pakiet: %s-%s-%s test plików = %d\n" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "u¿ytkownik %s nie istnieje - u¿yto konta root" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s nie istnieje - u¿yto grupy root" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozpakowanie archiwum nie powiod³o siê %s%s: %s" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr " na pliku " -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nie mo¿na otworzyæ %s: %s" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s nie powiod³o siê" @@ -2531,12 +2521,12 @@ msgstr "nie mo msgid "package %s is not installed\n" msgstr "pakiet %s nie jest zainstalowany\n" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 #, fuzzy msgid "(added files)" msgstr "b³êdny status pliku: %s" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 #, fuzzy msgid "(added provide)" msgstr "Udostêpniane zasoby:" @@ -2606,20 +2596,20 @@ msgid "OK" msgstr "OK" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, fuzzy, c-format msgid " %s A %s\tB %s\n" msgstr " rpm {--version}" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n" @@ -2962,13 +2952,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Blok sygnatury: %d\n" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s pominiêty z powodu flagi missingok\n" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "tworzenie katalogu: %s\n" @@ -2994,7 +2984,7 @@ msgstr "brak %s\n" #: lib/verify.c:518 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: " #: lib/verify.c:556 diff --git a/po/pt.po b/po/pt.po index 18ffc44..475852a 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: 2000-06-22 01:13+01:00\n" "Last-Translator: José Nuno Coelho Sanarra Pires\n" "Language-Team: pt \n" @@ -597,88 +597,88 @@ msgstr "Ficheiro listado duas vezes: %s\n" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "A 'symlink' aponta para a BuildRoot: %s -> %s\n" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "O ficheiro não corresponde ao prefixo (%s): %s\n" -#: build/files.c:1519 +#: build/files.c:1523 #, c-format msgid "File not found: %s\n" msgstr "Ficheiro não encontrado: %s\n" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Dono/grupo inválido: %s\n" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "Ficheiro: %4d: %07o %s.%s\t %s\n" -#: build/files.c:1678 +#: build/files.c:1682 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "O ficheiro precisa de começar por \"/\": %s\n" -#: build/files.c:1701 +#: build/files.c:1705 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "linha %d: Nome do ficheiro não permitido: %s\n" -#: build/files.c:1716 +#: build/files.c:1720 #, c-format msgid "File not found by glob: %s\n" msgstr "Ficheiro não encontrado pelo glob: %s\n" -#: build/files.c:1778 +#: build/files.c:1782 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Não consegui abrir o ficheiro do %%files %s: %s\n" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "linha: %s\n" -#: build/files.c:2162 +#: build/files.c:2166 #, c-format msgid "Bad file: %s: %s\n" msgstr "Ficheiro inválido: %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "Não consegui executar o %s: %S\n" -#: build/files.c:2241 +#: build/files.c:2245 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "Não consegui executar à parte o %s: &s\n" -#: build/files.c:2325 +#: build/files.c:2329 #, c-format msgid "%s failed\n" msgstr "O %s falhou\n" -#: build/files.c:2329 +#: build/files.c:2333 #, c-format msgid "failed to write all data to %s\n" msgstr "não consegui escrever todos os dados em %s\n" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "A procurar o %s: (usando o %s)...\n" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, c-format msgid "Failed to find %s:\n" msgstr "Não consegui encontrar o %s:\n" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "A processar os ficheiros: %s-%s-%s\n" @@ -823,7 +823,7 @@ msgstr "N msgid "Could not open %s: %s\n" msgstr "Não consigo aceder ao %s: %s\n" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, c-format msgid "Unable to write package: %s\n" msgstr "Não consegui gravar o pacote: %s\n" @@ -853,7 +853,7 @@ msgstr "N msgid "Unable to write payload to %s: %s\n" msgstr "Não consegui escrever o conteúdo de %s: %s\n" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "Gravei: %s\n" @@ -1420,105 +1420,95 @@ msgstr "" msgid " failed - " msgstr " falhou - " -#: lib/depends.c:114 +#: 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:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, fuzzy, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "o pacote %s já está instalado" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s SIM (oferecidos pelo rpmrc)\n" -#: lib/depends.c:757 +#: lib/depends.c:724 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s SIM (oferecidos pela rpmlib)\n" -#: lib/depends.c:778 +#: lib/depends.c:745 #, fuzzy msgid "(db files)" msgstr "ficheiro db inválido %s\n" -#: lib/depends.c:790 +#: lib/depends.c:757 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s SI (oferecidos pelo db)\n" -#: lib/depends.c:803 +#: lib/depends.c:770 #, fuzzy msgid "(db package)" msgstr "nenhum pacote\n" -#: lib/depends.c:842 +#: lib/depends.c:809 #, 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:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 #, fuzzy msgid "NO " msgstr "NÃO-OK" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, 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:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "=========== a guardar as relações do tsort\n" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "========== só os sucessores (ordem de apresentação)\n" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "CICLO:\n" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "========== a prosseguir o tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "(não é um número)" @@ -1611,88 +1601,88 @@ msgstr "%s criado como %s\n" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "o valor RPM_STRING_TYPE do dataLength() tem de ser 1.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "O tipo de dados %d não é suportado\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "falta um { depois do %" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "falta um } depois do %{" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "formato da opção em branco" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "nome da opção em branco" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "opção desconhecida" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "] esperado no fim do vector" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "] inesperado" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "} inesperado" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "esperado um ? na expressão" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "esperado um { a seguir ao ? na expressão" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "esperado um } na expressão" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "esperado um : a seguir à sub-expressão ?" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "esperado um { a seguir ao : na expressão" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "esperado um | no fim da expressão" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "(tipo desconhecido)" @@ -2227,108 +2217,108 @@ msgstr " est msgid "is needed by" msgstr " é necessário pelo %s-%s-%s\n" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "========== mudanças de local\n" -#: lib/psm.c:276 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "%5d excluir o %s\n" -#: lib/psm.c:279 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d mudar de local %s -> %s\n" -#: lib/psm.c:349 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "a exclur a directoria 'multilib' %s%s\n" -#: lib/psm.c:415 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "a excluir o %s %s\n" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "a mudar o %s para %s\n" -#: lib/psm.c:504 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "a mudar a directoria %s para %s\n" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "não consigo criar o %s: %s\n" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "não consigo escrever em %s\n" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "esperava-se um pacote com código-fonte, foi encontrado um pacote binário\n" -#: lib/psm.c:1324 +#: lib/psm.c:1316 msgid "source package contains no .spec file\n" msgstr "o pacote de código-fonte não contem um ficheiro .spec\n" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "a correr os programas de pós-instalação (se existirem)\n" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "a execução do 'scriptlet' %s do %s-%s-%s falhou com código de erro %d\n" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "a execução do 'scriptlet' %s do %s-%s-%s falhou com código de erro %d\n" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "pacote: teste dos ficheiros do %s-%s-%s = %d\n" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "o utilizador %s não existe - a usar o root\n" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "o grupo %s não existe - a usar o root\n" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "a abertura do pacote falhou%s%s: %s\n" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr " no ficheiro " -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "falhei ao aceder ao %s: %s\n" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "O %s falhou\n" @@ -2455,12 +2445,12 @@ msgstr "o registo %d n msgid "package %s is not installed\n" msgstr "o pacote %s não está instalado\n" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 #, fuzzy msgid "(added files)" msgstr "ficheiro db inválido %s\n" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s SI (oferecidos pelo db)\n" @@ -2529,7 +2519,7 @@ msgid "OK" msgstr "OK" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2538,13 +2528,13 @@ msgstr "" "A dependência \"B\" precisa duma época (assumindo a mesma que \"A\")\n" "\t %s\tB %s\n" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "requisito %s-%s-%s do pacote não satisfeito: %s\n" @@ -2876,13 +2866,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "'Pad' ou preenchimento da assinatura: %d\n" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ignorado devido à opção missingok\n" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "a excluir a directoria %s\n" @@ -2902,7 +2892,7 @@ msgstr "falta %s" #: lib/verify.c:518 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "Dependências não satisfeitas para o %s-%s-%s: " #: lib/verify.c:556 diff --git a/po/pt_BR.po b/po/pt_BR.po index a4b3037..8ef76d8 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-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" #: build.c:36 #, fuzzy @@ -660,96 +660,96 @@ msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" # , c-format -#: build/files.c:1495 +#: build/files.c:1499 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: build/files.c:1519 +#: build/files.c:1523 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "no foi passado pacote para desinstalao" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1678 +#: build/files.c:1682 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "argumentos para o --dbpath devem comear com uma /" # , c-format -#: build/files.c:1701 +#: build/files.c:1705 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "No consegui abrir: %s\n" -#: build/files.c:1716 +#: build/files.c:1720 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "no foi passado pacote para desinstalao" # , c-format -#: build/files.c:1778 +#: build/files.c:1782 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, fuzzy, c-format msgid "line: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" # , c-format -#: build/files.c:2162 +#: build/files.c:2166 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" # , c-format #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" # , c-format -#: build/files.c:2241 +#: build/files.c:2245 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: build/files.c:2325 +#: build/files.c:2329 #, fuzzy, c-format msgid "%s failed\n" msgstr "Construo falhou.\n" # , c-format -#: build/files.c:2329 +#: build/files.c:2333 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "No consegui abrir o pipe tar: %s\n" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" # , c-format -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "No consegui abrir o pipe tar: %s\n" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -911,7 +911,7 @@ msgid "Could not open %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "No consegui abrir: %s\n" @@ -946,7 +946,7 @@ msgstr "No consegui abrir: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "No consegui abrir: %s\n" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1578,103 +1578,93 @@ msgid " failed - " msgstr "Construo falhou.\n" # , c-format -#: lib/depends.c:114 +#: lib/depends.c:112 #, fuzzy, c-format msgid "cannot open Packages database in %s\n" msgstr "No consegui abrir: %s\n" -#: lib/depends.c:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, fuzzy, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "no foi passado pacote para instalao" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:757 +#: lib/depends.c:724 msgid "(rpmlib provides)" msgstr "" # , c-format -#: lib/depends.c:778 +#: lib/depends.c:745 #, fuzzy msgid "(db files)" msgstr "No consegui abrir: %s\n" -#: lib/depends.c:790 +#: lib/depends.c:757 msgid "(db provides)" msgstr "" -#: lib/depends.c:803 +#: lib/depends.c:770 #, fuzzy msgid "(db package)" msgstr "pesquise todos os pacotes" -#: lib/depends.c:842 +#: lib/depends.c:809 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" # , c-format -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "No consegui abrir: %s\n" #. Record all relations. -#: lib/depends.c:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "" @@ -1772,90 +1762,90 @@ msgstr "No consegui abrir: %s\n" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 #, fuzzy msgid "unexpected ]" msgstr "fonte de pesquisa no esperado" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 #, fuzzy msgid "unexpected }" msgstr "fonte de pesquisa no esperado" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "" @@ -2420,7 +2410,7 @@ msgstr "" msgid "is needed by" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" @@ -2432,13 +2422,13 @@ msgstr "" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/psm.c:276 +#: lib/psm.c:274 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "RPM verso %s\n" # , c-format -#: lib/psm.c:279 +#: lib/psm.c:277 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "No consegui abrir: %s\n" @@ -2451,7 +2441,7 @@ msgstr "No consegui abrir: %s\n" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/psm.c:349 +#: lib/psm.c:347 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "RPM verso %s\n" @@ -2464,94 +2454,94 @@ msgstr "RPM verso %s\n" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/psm.c:415 +#: lib/psm.c:413 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "RPM verso %s\n" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" # , c-format -#: lib/psm.c:504 +#: lib/psm.c:502 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1324 +#: lib/psm.c:1316 #, fuzzy msgid "source package contains no .spec file\n" msgstr "pesquise o pacote ao qual pertence" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "no execute nenhum estgio" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "no foi passado pacote para instalao" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "Construo falhou.\n" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "Construo falhou.\n" @@ -2684,12 +2674,12 @@ msgid "package %s is not installed\n" msgstr "no foi passado pacote para instalao" # , c-format -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 #, fuzzy msgid "(added files)" msgstr "No consegui abrir: %s\n" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 msgid "(added provide)" msgstr "" @@ -2761,20 +2751,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "no foi passado pacote para instalao" @@ -3139,7 +3129,7 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" @@ -3153,7 +3143,7 @@ msgstr "" # "Content-Transfer-Encoding: 8-bit\n" # , c-format #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "RPM verso %s\n" @@ -3173,7 +3163,7 @@ msgstr "" #: lib/verify.c:518 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "lista dependncias do pacote" #: lib/verify.c:556 diff --git a/po/ro.po b/po/ro.po index 92d8ee6..a1e287f 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -591,88 +591,88 @@ msgstr "" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1519 +#: build/files.c:1523 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1678 +#: build/files.c:1682 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1701 +#: build/files.c:1705 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1716 +#: build/files.c:1720 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1778 +#: build/files.c:1782 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2162 +#: build/files.c:2166 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2241 +#: build/files.c:2245 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2325 +#: build/files.c:2329 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2329 +#: build/files.c:2333 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -811,7 +811,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -841,7 +841,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1405,99 +1405,89 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:114 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:757 +#: lib/depends.c:724 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:778 +#: lib/depends.c:745 msgid "(db files)" msgstr "" -#: lib/depends.c:790 +#: lib/depends.c:757 msgid "(db provides)" msgstr "" -#: lib/depends.c:803 +#: lib/depends.c:770 msgid "(db package)" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:809 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "" @@ -1588,88 +1578,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "" @@ -2178,108 +2168,108 @@ msgstr "" msgid "is needed by" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:276 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:279 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:349 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:415 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:504 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1324 +#: lib/psm.c:1316 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2406,11 +2396,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 msgid "(added files)" msgstr "" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 msgid "(added provide)" msgstr "" @@ -2478,20 +2468,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2820,13 +2810,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -2846,7 +2836,7 @@ msgstr "" #: lib/verify.c:518 #, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "" #: lib/verify.c:556 diff --git a/po/rpm.pot b/po/rpm.pot index 02b8abd..d272a18 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-10 22:08-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -596,88 +596,88 @@ msgstr "" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1519 +#: build/files.c:1523 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1678 +#: build/files.c:1682 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1701 +#: build/files.c:1705 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1716 +#: build/files.c:1720 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1778 +#: build/files.c:1782 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2162 +#: build/files.c:2166 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2241 +#: build/files.c:2245 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2325 +#: build/files.c:2329 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2329 +#: build/files.c:2333 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2139 +#: build/pack.c:603 lib/psm.c:2138 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2404 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,83 +1410,83 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:114 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:416 +#: lib/depends.c:414 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:685 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:710 +#: lib/depends.c:708 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:726 +#: lib/depends.c:724 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:747 +#: lib/depends.c:745 msgid "(db files)" msgstr "" -#: lib/depends.c:759 +#: lib/depends.c:757 msgid "(db provides)" msgstr "" -#: lib/depends.c:772 +#: lib/depends.c:770 msgid "(db package)" msgstr "" -#: lib/depends.c:811 +#: lib/depends.c:809 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:813 lib/rpmds.c:563 lib/rpmds.c:721 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "" -#: lib/depends.c:813 lib/rpmds.c:563 lib/rpmds.c:721 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1155 +#: lib/depends.c:1153 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1388 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1459 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1534 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1594 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1629 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1634 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" @@ -1588,7 +1588,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:955 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2173,108 +2173,108 @@ msgstr "" msgid "is needed by" msgstr "" -#: lib/psm.c:271 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:275 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:278 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:348 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:414 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:424 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:503 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1152 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1158 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1198 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1317 +#: lib/psm.c:1316 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1427 +#: lib/psm.c:1426 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1595 +#: lib/psm.c:1594 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1602 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1944 +#: lib/psm.c:1943 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2061 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2175 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2184 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2225 +#: lib/psm.c:2224 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2226 +#: lib/psm.c:2225 msgid " on file " msgstr "" -#: lib/psm.c:2412 +#: lib/psm.c:2411 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2415 +#: lib/psm.c:2414 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2473,20 +2473,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:691 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:720 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:744 +#: lib/rpmds.c:750 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2815,13 +2815,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:206 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:876 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 2bd25d5..67469fb 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: 2001-08-29 13:55-0400\n" "Last-Translator: Eugene Kanter \n" "Language-Team: Black Cat Linux Team \n" @@ -614,88 +614,88 @@ msgstr " msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "óÉÍ×ÏÌÉÞÅÓËÁÑ ÓÓÙÌËÁ ÕËÁÚÙ×ÁÅÔ ÎÁ BuildRoot: %s -> %s\n" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "æÁÊÌ ÎÅ ÓÏÏÔ×ÅÔÓÔÕÅÔ ÐÒÅÆÉËÓÕ (%s): %s\n" -#: build/files.c:1519 +#: build/files.c:1523 #, c-format msgid "File not found: %s\n" msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ: %s\n" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "îÅ×ÅÒÎÁÑ ÐÁÒÁ ×ÌÁÄÅÌÅÃ/ÇÒÕÐÐÁ: %s\n" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "æÁÊÌ %4d: %07o %s.%s\t %s\n" -#: build/files.c:1678 +#: build/files.c:1682 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "æÁÊÌ ÄÏÌÖÅÎ ÎÁÞÉÎÁÔØÓÑ Ó \"/\": %s\n" -#: build/files.c:1701 +#: build/files.c:1705 #, c-format msgid "Glob not permitted: %s\n" msgstr "Glob ÎÅ ÒÁÚÒÅÛÁÀÔÓÑ: %s\n" -#: build/files.c:1716 +#: build/files.c:1720 #, c-format msgid "File not found by glob: %s\n" msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ: %s\n" -#: build/files.c:1778 +#: build/files.c:1782 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %%files %s: %s\n" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "ÓÔÒÏËÁ: %s\n" -#: build/files.c:2162 +#: build/files.c:2166 #, c-format msgid "Bad file: %s: %s\n" msgstr "îÅ×ÅÒÎÙÊ ÆÁÊÌ %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÌÎÉÔØ %s: %s\n" -#: build/files.c:2241 +#: build/files.c:2245 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "óÂÏÊ ×ÅÔ×ÌÅÎÉÑ %s: %s\n" -#: build/files.c:2325 +#: build/files.c:2329 #, c-format msgid "%s failed\n" msgstr "%s ÎÅ ÕÄÁÌÏÓØ\n" -#: build/files.c:2329 +#: build/files.c:2333 #, c-format msgid "failed to write all data to %s\n" msgstr "ÚÁÐÉÓØ ×ÓÅÈ ÄÁÎÎÙÈ × %s ÎÅ ÕÄÁÌÁÓØ\n" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "ðÏÉÓË %s (ÉÓÐÏÌØÚÕÑ %s): ...\n" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, c-format msgid "Failed to find %s:\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ %s:\n" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "ïÂÒÁÂÁÔÙ×ÁÀÔÓÑ ÆÁÊÌÙ: %s-%s-%s\n" @@ -834,7 +834,7 @@ msgstr " msgid "Could not open %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, c-format msgid "Unable to write package: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÐÁËÅÔ: %s\n" @@ -864,7 +864,7 @@ msgstr " msgid "Unable to write payload to %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÓÏÄÅÒÖÉÍÏÅ × %s: %s\n" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "úÁÐÉÓÁÎ: %s\n" @@ -1441,106 +1441,96 @@ msgstr " msgid " failed - " msgstr "ÎÅ ÕÄÁÌÏÓØ - " -#: lib/depends.c:114 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n" -#: lib/depends.c:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, fuzzy, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "ÐÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s YES (rpmrc provides)\n" -#: lib/depends.c:757 +#: lib/depends.c:724 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s YES (rpmlib provides)\n" -#: lib/depends.c:778 +#: lib/depends.c:745 #, fuzzy msgid "(db files)" msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n" -#: lib/depends.c:790 +#: lib/depends.c:757 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s YES (db provides)\n" -#: lib/depends.c:803 +#: lib/depends.c:770 #, fuzzy msgid "(db package)" msgstr "ÎÅÔ ÐÁËÅÔÏ×\n" -#: lib/depends.c:842 +#: lib/depends.c:809 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) ÄÏÂÁ×ÌÅÎÏ × ËÅÛ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "îåT" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "äá" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n" #. Record all relations. -#: lib/depends.c:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "========== ÚÁÐÉÓØ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== ÓÏÒÔÉÒÏ×ËÁ ÐÁËÅÔÏ× (ÏÞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, " "ÇÌÕÂÉÎÁ)\n" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "========== ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌÉ (× ÐÏÒÑÄËÅ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ)\n" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "ãéëì:\n" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "========== ÐÒÏÄÏÌÖÅÎÉÅ ÕÐÏÒÑÄÏÞÅÎÉÑ ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "(ÎÅ ÞÉÓÌÏ)" @@ -1634,88 +1624,88 @@ msgstr "%s #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() ÄÏÐÕÓÔÉÍ ÔÏÌØËÏ ÏÄÉÎ ÜÌÅÍÅÎÔ ÔÉÐÁ RPM_STRING_TYPE\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "ôÉÐ ÄÁÎÎÙÈ %d ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ \"{\" ÐÏÓÌÅ \"%\"" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ \"}\" ÐÏÓÌÅ \"%{\"" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "ÐÕÓÔÏÊ ÆÏÒÍÁÔ ÔÜÇÁ" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "ÐÕÓÔÏÅ ÉÍÑ ÔÜÇÁ" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÜÇ" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "× ËÏÎÃÅ ÍÁÓÓÉ×Á ÏÖÉÄÁÌÁÓØ \"]\"" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "ÎÅÏÖÉÄÁÎÎÁÑ \"]\"" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "ÎÅÏÖÉÄÁÎÎÁÑ \"}\"" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÏÖÉÄÁÌÏÓØ \"?\"" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \"?\" ÏÖÉÄÁÌÏÓØ \"{\"" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÏÖÉÄÁÌÏÓØ \"}\"" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \"?\" ÏÖÉÄÁÌÏÓØ \":\"" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \":\" ÏÖÉÄÁÌÏÓØ \"{\"" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "× ËÏÎÃÅ ×ÙÒÁÖÅÎÉÑ ÏÖÉÄÁÌÓÑ \"|\"" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "(ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ)" @@ -2243,108 +2233,108 @@ msgstr " msgid "is needed by" msgstr " ÎÕÖÅÎ ÄÌÑ %s-%s-%s\n" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "========== ÐÅÒÅÍÅÝÅÎÉÊ\n" -#: lib/psm.c:276 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "%5d ÉÓËÌÀÞÅÎ %s\n" -#: lib/psm.c:279 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d ÐÅÒÅÍÅÝÅÎÉÅ %s -> %s\n" -#: lib/psm.c:349 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "ÉÓËÌÀÞÁÅÔÓÑ ÍÎÏÇÏÂÉÂÌÉÏÔÅÞÎÙÊ ÐÕÔØ %s%s\n" -#: lib/psm.c:415 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "ÉÓËÌÀÞÁÅÔÓÑ %s %s\n" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "ÐÅÒÅÍÅÝÁÅÔÓÑ %s × %s\n" -#: lib/psm.c:504 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "ÐÅÒÅÍÅÝÁÅÔÓÑ ËÁÔÁÌÏÇ %s × %s\n" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %%%s %s\n" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÉÓÁÔØ × %%%s %s\n" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "ÏÂÎÁÒÕÖÅÎ Ä×ÏÉÞÎÙÊ ÐÁËÅÔ ×ÍÅÓÔÏ ÏÖÉÄÁÅÍÏÇÏ ÉÓÈÏÄÎÏÇÏ\n" -#: lib/psm.c:1324 +#: lib/psm.c:1316 msgid "source package contains no .spec file\n" msgstr "ÉÓÈÏÄÎÙÊ ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ\n" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: ×ÙÐÏÌÎÑÅÔÓÑ ÓÃÅÎÁÒÉÊ %s (ÅÓÌÉ ÅÓÔØ)\n" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "ÏÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ÓÃÅÎÁÒÉÑ %s ÉÚ %s-%s-%s, waitpid() ×ÏÚ×ÒÁÔÉÌ %s\n" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "ÏÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ÓÃÅÎÁÒÉÑ %s ÉÚ %s-%s-%s, ËÏÄ ×ÏÚ×ÒÁÔÁ %d\n" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s ÓÏÄÅÒÖÉÔ %d ÆÁÊÌÏ×, test = %d\n" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "%s: ÏÛÉÂËÁ ÓÃÅÎÁÒÉÑ %s (%d), %s-%s-%s ÐÒÏÐÕÓËÁÅÔÓÑ\n" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "ÐÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "ÇÒÕÐÐÁ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "ÒÁÓÐÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s\n" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr " ÎÁ ÆÁÊÌÅ " -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ÏÛÉÂËÁ ÎÁ ÆÁÊÌÅ %s: %s\n" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, c-format msgid "%s failed: %s\n" msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n" @@ -2471,12 +2461,12 @@ msgstr " msgid "package %s is not installed\n" msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 #, fuzzy msgid "(added files)" msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s YES (db provides)\n" @@ -2545,7 +2535,7 @@ msgid "OK" msgstr "Oë" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2554,13 +2544,13 @@ msgstr "" "ÄÌÑ ÚÁ×ÉÓÉÍÏÓÔÉ \"B\" ÎÕÖÎÏ ÕËÁÚÁÔØ \"epoch\" (ÔÁË ÖÅ ËÁË ÄÌÑ \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n" @@ -2893,13 +2883,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "ðÏÄÐÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁÐÏÌÎÅÎÉÅ(%d)\n" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s ÐÒÏÐÕÝÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "ÉÓËÌÀÞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n" @@ -2923,7 +2913,7 @@ msgstr " #: lib/verify.c:518 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: " #: lib/verify.c:556 diff --git a/po/sk.po b/po/sk.po index 056eb5d..dd66b7a 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -625,88 +625,88 @@ msgstr "S msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1495 +#: build/files.c:1499 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Súbor nesúhlasí s prefixom (%s): %s." -#: build/files.c:1519 +#: build/files.c:1523 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Súbor nebol nájdený: %s" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Chybný vlastník/skupina: %s\n" -#: build/files.c:1574 +#: build/files.c:1578 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "Súbor %4d: 0%o %s.%s\t %s\n" -#: build/files.c:1678 +#: build/files.c:1682 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "Súbor potrebuje na zaèiatku \"/\": %s" -#: build/files.c:1701 +#: build/files.c:1705 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "riadok %d: V %s sú vy¾adované verzie: %s" -#: build/files.c:1716 +#: build/files.c:1720 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "Súbor nebol nájdený: %s" -#: build/files.c:1778 +#: build/files.c:1782 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "chybe: nie je mo¾né otvori» %%files súbor: %s" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, fuzzy, c-format msgid "line: %s\n" msgstr "riadok: %s" -#: build/files.c:2162 +#: build/files.c:2166 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "súbor %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "Nie je mo¾né spusti» %s" -#: build/files.c:2241 +#: build/files.c:2245 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "Nie je mo¾né vytvori» proces %s" -#: build/files.c:2325 +#: build/files.c:2329 #, fuzzy, c-format msgid "%s failed\n" msgstr "%s zlyhalo" -#: build/files.c:2329 +#: build/files.c:2333 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "nepodarilo sa zapísa» v¹etky dáta do %s" -#: build/files.c:2465 +#: build/files.c:2469 #, fuzzy, c-format msgid "Finding %s: (using %s)...\n" msgstr "Zis»ujú sa po¾adované vlastnosti...\n" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "Nepodarilo sa zisti» poskytované vlastnosti" -#: build/files.c:2626 +#: build/files.c:2630 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Spracovávajú sa súbory: %s\n" @@ -850,7 +850,7 @@ msgstr "Nie je mo msgid "Could not open %s: %s\n" msgstr "Otvorenie %s zlyhalo\n" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nie je mo¾né zapísa» balík: %s" @@ -880,7 +880,7 @@ msgstr "Nie je mo msgid "Unable to write payload to %s: %s\n" msgstr "Nie je mo¾né zapísa» balík: %s" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "Zapísané: %s\n" @@ -1464,105 +1464,95 @@ msgstr "" msgid " failed - " msgstr " zlyhalo - " -#: lib/depends.c:114 +#: 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:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, fuzzy, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 #, fuzzy msgid "(rpmrc provides)" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:757 +#: lib/depends.c:724 #, fuzzy msgid "(rpmlib provides)" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/depends.c:778 +#: lib/depends.c:745 #, fuzzy msgid "(db files)" msgstr "chybný stav súboru: %s" -#: lib/depends.c:790 +#: lib/depends.c:757 #, fuzzy msgid "(db provides)" msgstr "Poskytuje:" -#: lib/depends.c:803 +#: lib/depends.c:770 #, fuzzy msgid "(db package)" msgstr "nájdených %d balíkov\n" -#: lib/depends.c:842 +#: lib/depends.c:809 #, 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:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 #, fuzzy msgid "NO " msgstr "NIE JE V PORIADKU" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, 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:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "(nie je èíslo)" @@ -1655,89 +1645,89 @@ msgstr "varovanie: %s vytvoren #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 #, fuzzy msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabData() RPM_STRING_TYPE poèet musí by» 1.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "Typ údajov %d nie je podorovaný\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "chýbajúce { po %" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "chýbajúce } po %{" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "prázdny tag formát" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "prázdne meno tagu" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "neznámy tag" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "] oèakávané na konci poµa" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "neoèakávané ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "neoèakávané }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "? oèakávané vo výraze" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "{ oèakávané po ? vo výraze" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "} oèakávané vo výraze" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr ": oèakávané po ? podvýraze" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "{ oèakávané po : vo výraze" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "| oèakávené na konci výrazu" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "(neznámy typ)" @@ -2296,110 +2286,110 @@ msgstr " koliduje s %s-%s-%s\n" msgid "is needed by" msgstr " je vy¾adované %s-%s-%s\n" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:276 +#: lib/psm.c:274 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "OS je vynechaný: %s" -#: lib/psm.c:279 +#: lib/psm.c:277 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "presúva sa %s do %s\n" -#: lib/psm.c:349 +#: lib/psm.c:347 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "vynecháva sa %s\n" -#: lib/psm.c:415 +#: lib/psm.c:413 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "vynecháva sa %s\n" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "presúva sa %s do %s\n" -#: lib/psm.c:504 +#: lib/psm.c:502 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "presúva sa %s do %s\n" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "nie je mo¾né zapísa» do %s: " -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "nie je mo¾né zapísa» do %s: " -#: lib/psm.c:1200 +#: lib/psm.c:1197 #, fuzzy msgid "source package expected, binary found\n" msgstr "oèakávaný zdrojový balík, nájdený binárny" -#: lib/psm.c:1324 +#: lib/psm.c:1316 #, fuzzy msgid "source package contains no .spec file\n" msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "vykonanie skriptu zlyhalo" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "vykonanie skriptu zlyhalo" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "balík: %s-%s-%s test súborov = %d\n" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "pou¾ívateµ %s neexistuje - pou¾ije sa root" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ije sa root" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalenie archívu zlyhalo%s%s: %s" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr " pre súbor " -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nepodarilo sa otvori» %s: %s" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s zlyhalo" @@ -2528,12 +2518,12 @@ msgstr "z msgid "package %s is not installed\n" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 #, fuzzy msgid "(added files)" msgstr "chybný stav súboru: %s" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 #, fuzzy msgid "(added provide)" msgstr "Poskytuje:" @@ -2603,20 +2593,20 @@ msgid "OK" msgstr "V PORIADKU" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, fuzzy, c-format msgid " %s A %s\tB %s\n" msgstr " rpm {--version}" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" @@ -2959,13 +2949,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Doplnenie podpisu: %d\n" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s vynechané kvôli príznaku missingok\n" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "vytvára sa adresár %s\n" @@ -2991,7 +2981,7 @@ msgstr "ch #: lib/verify.c:518 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: " #: lib/verify.c:556 diff --git a/po/sl.po b/po/sl.po index 998910d..15f9fa0 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,12 +1,12 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primo¾ Peterlin , 2000. -# $Id: sl.po,v 1.198 2001/11/10 01:40:13 jbj Exp $ +# $Id: sl.po,v 1.199 2001/11/11 12:47:34 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -623,88 +623,88 @@ msgstr "Datoteka je navedena dvakrat: %s" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Simbolna povezava ka¾e na BuildRoot: %s -> %s" -#: build/files.c:1495 +#: build/files.c:1499 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Datoteka se ne ujema s predpono (%s): %s" -#: build/files.c:1519 +#: build/files.c:1523 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Datoteke ni mogoèe najti: %s" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Neobstojeè lastnik/skupina: %s\n" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "Datoteka: %4d: %07o %s.%s\t %s\n" -#: build/files.c:1678 +#: build/files.c:1682 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "Datoteki manjka uvodni \"/\": %s" -#: build/files.c:1701 +#: build/files.c:1705 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "vrstica %d: Razlièica ni dovoljena: %s" -#: build/files.c:1716 +#: build/files.c:1720 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "Datoteke ni mo¾no najti z raz¹iritvijo metaznakov v imenu: %s" -#: build/files.c:1778 +#: build/files.c:1782 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Datoteke %s iz %%files ni mo¾no odpreti: %s" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, fuzzy, c-format msgid "line: %s\n" msgstr "vrstica: %s" -#: build/files.c:2162 +#: build/files.c:2166 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "Po¹kodovana datoteka: %s: %s" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "Ni mo¾no izvesti %s: %s" -#: build/files.c:2241 +#: build/files.c:2245 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "Vejitev %s ni mo¾na: %s" -#: build/files.c:2325 +#: build/files.c:2329 #, fuzzy, c-format msgid "%s failed\n" msgstr "%s neuspe¹en" -#: build/files.c:2329 +#: build/files.c:2333 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "pisanje podatkov v %s je bilo neuspe¹no" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "Iskanje %s: (z uporabo %s)...\n" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "Neuspe¹no iskanje %s:" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Obdeloavnje datotek: %s-%s-%s\n" @@ -848,7 +848,7 @@ msgstr "Ikone %s ni mo msgid "Could not open %s: %s\n" msgstr "Ni mo¾no odpreti %s: %s\n" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Ni mo¾no zapisati paketa: %s" @@ -878,7 +878,7 @@ msgstr "Ikone %s ni mo msgid "Unable to write payload to %s: %s\n" msgstr "Ni mo¾no zapisati paketa %s: %s" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -1465,105 +1465,95 @@ msgstr "" msgid " failed - " msgstr " neuspe¹no - " -#: lib/depends.c:114 +#: 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:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, fuzzy, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "paket %s-%s-%s je ¾e name¹èen" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s DA (rpmrc ponudbe)\n" -#: lib/depends.c:757 +#: lib/depends.c:724 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s DA (rpmlib ponudbe)\n" -#: lib/depends.c:778 +#: lib/depends.c:745 #, fuzzy msgid "(db files)" msgstr "po¹kodovana zbirka podatkov %s" -#: lib/depends.c:790 +#: lib/depends.c:757 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s DA (db ponudbe)\n" -#: lib/depends.c:803 +#: lib/depends.c:770 #, fuzzy msgid "(db package)" msgstr "ni paketov\n" -#: lib/depends.c:842 +#: lib/depends.c:809 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 #, fuzzy msgid "NO " msgstr "NI DOBRO" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstranjujemo seznam skupin\n" #. Record all relations. -#: lib/depends.c:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "(ni ¹tevilo)" @@ -1656,89 +1646,89 @@ msgstr "opozorilo: %s ustvarjen kot %s" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 #, fuzzy msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "¹tevec grabData() RPM_STRING_TYPE mora biti 1.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "Tip podatkov %d ni podprt\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "manjkajoèi { za %" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "manjkajoèi } za %{" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "oblika znaèke manjka" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "ime znaèke manjka" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "neznana znaèka" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "na koncu polja je prièakovan ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "neprièakovan ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "neprièakovan }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "v izrazu je prièakovan ?" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "v izrazu je za { prièakovan ?" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "v izrazu je prièakovan }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "za podizrazom ? je prièakovano :" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "v izrazu je za : prièakovan {" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "na koncu izraza je prièakovan |" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "(neznan tip)" @@ -2295,110 +2285,110 @@ msgstr " je v sporu z %s-%s-%s\n" msgid "is needed by" msgstr " potrebuje %s-%s-%s\n" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:276 +#: lib/psm.c:274 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "OS je izkljuèen: %s" -#: lib/psm.c:279 +#: lib/psm.c:277 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "premikanje %s v %s\n" -#: lib/psm.c:349 +#: lib/psm.c:347 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "izkljuèevanje datoteke %s%s\n" -#: lib/psm.c:415 +#: lib/psm.c:413 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "izkljuèevanje datoteke %s%s\n" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "premikanje %s v %s\n" -#: lib/psm.c:504 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "premiokanje imenika %s v %s\n" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "ni mo¾no ustvariti %s: %s\n" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "pisanje na %s ni mo¾no" -#: lib/psm.c:1200 +#: lib/psm.c:1197 #, fuzzy msgid "source package expected, binary found\n" msgstr "prièakovan je bil izvorni paket, najden binarni" -#: lib/psm.c:1324 +#: lib/psm.c:1316 #, fuzzy msgid "source package contains no .spec file\n" msgstr "izvorni paket ne vsebuje datoteke .spec" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "poganjanje ponamestitvenih skript (èe obstajajo)\n" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "skript se ni uspe¹no izvedel" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "skript se ni uspe¹no izvedel" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "paket: %s-%s-%s datoteke test = %d\n" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "uporabnik %s ne obstaja - uporabljam root" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s ne obstaja - uporabljam root" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "raz¹iritev arhiva je bilo neuspe¹no%s%s: %s" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr " za datoteko " -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspe¹no odpiranje %s: %s\n" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s neuspe¹en" @@ -2527,12 +2517,12 @@ msgstr "zapisa %d ni mo msgid "package %s is not installed\n" msgstr "paket %s ni name¹èen\n" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 #, fuzzy msgid "(added files)" msgstr "po¹kodovana zbirka podatkov %s" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s DA (db ponudbe)\n" @@ -2601,7 +2591,7 @@ msgid "OK" msgstr "V REDU" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2610,13 +2600,13 @@ msgstr "" "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" @@ -2957,13 +2947,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Dol¾. polnila : %d\n" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s preskoèen zaradi manjkajoèe zastavice OK\n" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "izkljuèevanje imenika %s\n" @@ -2987,7 +2977,7 @@ msgstr "manjka %s\n" #: lib/verify.c:518 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: " #: lib/verify.c:556 diff --git a/po/sr.po b/po/sr.po index cdc81e6..eb0727e 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" @@ -609,88 +609,88 @@ msgstr "Neuspelo msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1495 +#: build/files.c:1499 #, fuzzy, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Neuspelo èitanje %s: %s." -#: build/files.c:1519 +#: build/files.c:1523 #, fuzzy, c-format msgid "File not found: %s\n" msgstr "Datoteka nije pronaðena na serveru" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1574 +#: build/files.c:1578 #, fuzzy, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/files.c:1678 +#: build/files.c:1682 #, fuzzy, c-format msgid "File needs leading \"/\": %s\n" msgstr "preme¹tanja moraju poèeti znakom '/'" -#: build/files.c:1701 +#: build/files.c:1705 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "paket %s nije naveden u %s" -#: build/files.c:1716 +#: build/files.c:1720 #, fuzzy, c-format msgid "File not found by glob: %s\n" msgstr "Datoteka nije pronaðena na serveru" -#: build/files.c:1778 +#: build/files.c:1782 #, fuzzy, c-format msgid "Could not open %%files file %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, fuzzy, c-format msgid "line: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/files.c:2162 +#: build/files.c:2166 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "neuspelo otvaranje %s: %s" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "Ne mogu da izvr¹im PGP" -#: build/files.c:2241 +#: build/files.c:2245 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "Ne mogu da proèitam 'sigtarget'" -#: build/files.c:2325 +#: build/files.c:2329 #, fuzzy, c-format msgid "%s failed\n" msgstr "PGP omanuo" -#: build/files.c:2329 +#: build/files.c:2333 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "neuspelo kreiranje %s\n" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "neuspelo kreiranje %s\n" -#: build/files.c:2626 +#: build/files.c:2630 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "neuspelo otvaranje %s: %s" @@ -833,7 +833,7 @@ msgstr "Ne mogu da upi msgid "Could not open %s: %s\n" msgstr "neuspelo otvaranje %s\n" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Ne mogu da upi¹em %s" @@ -863,7 +863,7 @@ msgstr "Ne mogu da upi msgid "Unable to write payload to %s: %s\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1449,104 +1449,94 @@ msgstr "" msgid " failed - " msgstr "PGP omanuo" -#: lib/depends.c:114 +#: 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:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, fuzzy, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "paket %s nije instaliran\n" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 #, fuzzy msgid "(rpmrc provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:757 +#: lib/depends.c:724 #, fuzzy msgid "(rpmlib provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:778 +#: lib/depends.c:745 #, fuzzy msgid "(db files)" msgstr "neuspelo otvaranje %s: %s" -#: lib/depends.c:790 +#: lib/depends.c:757 #, fuzzy msgid "(db provides)" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:803 +#: lib/depends.c:770 #, fuzzy msgid "(db package)" msgstr "upit nad svim paketima" -#: lib/depends.c:842 +#: lib/depends.c:809 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, 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:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "(nije broj)" @@ -1639,90 +1629,90 @@ msgstr "Ne mogu da otvorim datoteku %s: " #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "nedostaje { posle %" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "nedostaje } posle %" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "prazan 'tag' format'" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "prazno ime tag-a" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "nepoznat tag" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "] oèekivano na kraju niza" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "neoèekivano ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "neoèekivano }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "oèekivan znak ? u izrazu" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 #, fuzzy msgid "{ expected after ? in expression" msgstr "{ oèekivano posle ? u izrazu" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "} oèekivano u izrazu" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "oèekivano : praæeno ? podizrazom" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 #, fuzzy msgid "{ expected after : in expression" msgstr "{ oèekivano posle : u izrazu" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "| oèekivano na kraju izraza" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "(nepoznat tip)" @@ -2282,109 +2272,109 @@ msgstr " se sudara sa %s-%s-%s\n" msgid "is needed by" msgstr " je potreban paketu %s-%s-%s\n" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:276 +#: lib/psm.c:274 #, fuzzy, c-format msgid "%5d exclude %s\n" msgstr "Pribavljam %s\n" -#: lib/psm.c:279 +#: lib/psm.c:277 #, fuzzy, c-format msgid "%5d relocate %s -> %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/psm.c:349 +#: lib/psm.c:347 #, fuzzy, c-format msgid "excluding multilib path %s%s\n" msgstr "Pribavljam %s\n" -#: lib/psm.c:415 +#: lib/psm.c:413 #, fuzzy, c-format msgid "excluding %s %s\n" msgstr "Pribavljam %s\n" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:504 +#: lib/psm.c:502 #, fuzzy, c-format msgid "relocating directory %s to %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, fuzzy, c-format msgid "cannot create %%%s %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, fuzzy, c-format msgid "cannot write to %%%s %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1324 +#: lib/psm.c:1316 #, fuzzy msgid "source package contains no .spec file\n" msgstr "upit nad paketom koji ima " -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "nemoj izvr¹iti nijednu fazu" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "neuspelo izvr¹avanje skripta" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, fuzzy, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "neuspelo izvr¹avanje skripta" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, fuzzy, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "PGP omanuo" @@ -2514,12 +2504,12 @@ msgstr "ne mogu da pro msgid "package %s is not installed\n" msgstr "paket %s nije instaliran\n" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 #, fuzzy msgid "(added files)" msgstr "neuspelo otvaranje %s: %s" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 #, fuzzy msgid "(added provide)" msgstr "datoteka %s ne pripada nijednom paketu\n" @@ -2590,20 +2580,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s nije naveden u %s" @@ -2948,13 +2938,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, fuzzy, c-format msgid "excluding directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" @@ -2974,7 +2964,7 @@ msgstr "nedostaje { posle %" #: lib/verify.c:518 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "Nezadovoljene meðuzavisnosti za %s-%s-%s: " #: lib/verify.c:556 diff --git a/po/sv.po b/po/sv.po index 7de4380..661c75c 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: 2001-09-12 14:18+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -605,88 +605,88 @@ msgstr "Filen uppr msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Symbolisk länk pekar på BuildRoot: %s -> %s\n" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Filen matchar inte prefixet (%s): %s\n" -#: build/files.c:1519 +#: build/files.c:1523 #, c-format msgid "File not found: %s\n" msgstr "Filen hittades inte: %s\n" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Felaktig ägare/grupp: %s\n" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "Fil %4d: %07o %s.%s\t %s\n" -#: build/files.c:1678 +#: build/files.c:1682 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "Filen behöver inledande \"/\": %s\n" -#: build/files.c:1701 +#: build/files.c:1705 #, c-format msgid "Glob not permitted: %s\n" msgstr "Matchning inte tillåtet: %s\n" -#: build/files.c:1716 +#: build/files.c:1720 #, c-format msgid "File not found by glob: %s\n" msgstr "Hittade ingen fil vid matchningen: %s\n" -#: build/files.c:1778 +#: build/files.c:1782 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "Kunde inte öppna %%files-fil %s: %s\n" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "rad: %s\n" -#: build/files.c:2162 +#: build/files.c:2166 #, c-format msgid "Bad file: %s: %s\n" msgstr "Felaktig fil: %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "Kunde inte köra %s: %s\n" -#: build/files.c:2241 +#: build/files.c:2245 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "Kunde inte grena %s: %s\n" -#: build/files.c:2325 +#: build/files.c:2329 #, c-format msgid "%s failed\n" msgstr "%s misslyckades\n" -#: build/files.c:2329 +#: build/files.c:2333 #, c-format msgid "failed to write all data to %s\n" msgstr "kunde inte skriva all data till %s\n" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "Letar upp %s: (använder %s)...\n" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, c-format msgid "Failed to find %s:\n" msgstr "Misslyckades med att hitta %s:\n" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Bearbetar filer: %s-%s-%s\n" @@ -825,7 +825,7 @@ msgstr "Kan inte l msgid "Could not open %s: %s\n" msgstr "Kunde inte öppna %s: %s\n" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunde inte skriva paket: %s\n" @@ -855,7 +855,7 @@ msgstr "Kan inte l msgid "Unable to write payload to %s: %s\n" msgstr "Kan inte skriva last till %s: %s\n" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1426,105 +1426,95 @@ msgstr "Ingen arkivfilen i huvud" msgid " failed - " msgstr " misslyckades - " -#: lib/depends.c:114 +#: 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:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, fuzzy, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "paket %s är redan installerat" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n" -#: lib/depends.c:757 +#: lib/depends.c:724 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s JA (rpmlib tillhandahåller)\n" -#: lib/depends.c:778 +#: lib/depends.c:745 #, fuzzy msgid "(db files)" msgstr "felaktig db-fil %s\n" -#: lib/depends.c:790 +#: lib/depends.c:757 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s JA (db-tillhandahållande)\n" -#: lib/depends.c:803 +#: lib/depends.c:770 #, fuzzy msgid "(db package)" msgstr "inga paket\n" -#: lib/depends.c:842 +#: lib/depends.c:809 #, fuzzy, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "%s: (%s, %s) tillagt till beroendecachen.\n" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "NEJ " -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "JA" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, 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:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "========== noterar alla relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== tsort:erar paket (ordning, #föregångare, #efterföljare, djup)\n" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "========== endast efterföljare (presentationsordning)\n" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "LOOP:\n" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "========== fortsätter med tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "(inte ett tal)" @@ -1618,88 +1608,88 @@ msgstr "%s skapades som %s\n" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE antal måste vara 1.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "Datatyp %d stöds inte\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "{ fattas efter %" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "} fattas efter %{" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "tomt taggformat" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "tomt taggnamn" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "okänd tagg" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "] förväntades vid slutet på vektor" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "oväntad ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "oväntad }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "? förväntades i uttryck" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "{ förväntades efter ? i uttryck" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "} förväntades i uttryck" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr ": förväntades efter ? i deluttryck" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "{ förväntades efter : i uttryck" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "| förväntades vid slutet på uttryck" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "(okänd typ)" @@ -2226,109 +2216,109 @@ msgstr " st msgid "is needed by" msgstr " behövs av %s-%s-%s\n" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "========== omflyttningar\n" -#: lib/psm.c:276 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "%5d utesluter %s\n" -#: lib/psm.c:279 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d flyttar om %s -> %s\n" -#: lib/psm.c:349 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "hoppar över multilib-sökväg %s%s\n" -#: lib/psm.c:415 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "hoppar över %s %s\n" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "flyttar %s till %s\n" -#: lib/psm.c:504 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "flyttar katalogen %s till %s\n" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "kan inte skapa %%%s %s\n" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "kan inte skriva till %%%s %s\n" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "källpaket förväntades, fann binärpaket\n" -#: lib/psm.c:1324 +#: lib/psm.c:1316 msgid "source package contains no .spec file\n" msgstr "källpaket innehåller ingen .spec-fil\n" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: kör (eventuellt) %s-skript\n" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" "körning av %s-skript från %s-%s-%s misslyckades, waitpid returnerade %s\n" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "körning av %s-skript från %s-%s-%s misslyckades, slutstatus %d\n" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s har %d filer, test = %d\n" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "%s: %s-skript misslyckades (%d), hoppar över %s-%s-%s\n" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "användare %s finns inte - använder root\n" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "grupp %s finns inte - använder root\n" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "uppackning av arkiv misslyckades%s%s: %s\n" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr " vid fil " -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s misslyckades på fil %s: %s\n" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, c-format msgid "%s failed: %s\n" msgstr "%s misslyckades: %s\n" @@ -2455,12 +2445,12 @@ msgstr "post %u kunde inte l msgid "package %s is not installed\n" msgstr "paket %s är inte installerat\n" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 #, fuzzy msgid "(added files)" msgstr "felaktig db-fil %s\n" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s JA (db-tillhandahållande)\n" @@ -2529,7 +2519,7 @@ msgid "OK" msgstr "OK" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2538,13 +2528,13 @@ msgstr "" "\"B\"-beroendet behöver en epok (antar samma som \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n" @@ -2878,13 +2868,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "%s överhoppad på grund av missingok-flagga\n" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "hoppar över katalogen %s\n" @@ -2907,7 +2897,7 @@ msgstr "saknas %s" #: lib/verify.c:518 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "Ouppfyllda beroenden för %s-%s-%s: " #: lib/verify.c:556 diff --git a/po/tr.po b/po/tr.po index 398bf41..e5aaad1 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -612,88 +612,88 @@ msgstr "Dosya iki kere g msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "Sembolik bað BuildRoot gösteriyor: %s -> %s\n" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "Dosya önek (%s) ile uyumsuz: %s\n" -#: build/files.c:1519 +#: build/files.c:1523 #, c-format msgid "File not found: %s\n" msgstr "Dosya bulunamadý: %s\n" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Kullanýcý/grup hatalý: %s\n" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "Dosya %4d: %07o %s.%s\t %s\n" -#: build/files.c:1678 +#: build/files.c:1682 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "Dosya \"/\" ile içermeli: %s\n" -#: build/files.c:1701 +#: build/files.c:1705 #, fuzzy, c-format msgid "Glob not permitted: %s\n" msgstr "satýr %d: Dosya adý uygun deðil: %s\n" -#: build/files.c:1716 +#: build/files.c:1720 #, c-format msgid "File not found by glob: %s\n" msgstr "Dosya glob tarafýndan bulunamadý: %s\n" -#: build/files.c:1778 +#: build/files.c:1782 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "%%files dosya %s dosyasýnda açýlamadý: %s\n" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "satýr: %s\n" -#: build/files.c:2162 +#: build/files.c:2166 #, c-format msgid "Bad file: %s: %s\n" msgstr "Dosya hatalý: %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "%s icra edilemedi: %s\n" -#: build/files.c:2241 +#: build/files.c:2245 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "%s ayrýlamadý: %s\n" -#: build/files.c:2325 +#: build/files.c:2329 #, c-format msgid "%s failed\n" msgstr "%s baþarýsýz\n" -#: build/files.c:2329 +#: build/files.c:2333 #, c-format msgid "failed to write all data to %s\n" msgstr "tüm veri %s içine yazýlamadý\n" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "%s aranýyor: (%s kullanarak)...\n" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, c-format msgid "Failed to find %s:\n" msgstr "%s bulunamadý:\n" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Ýþlenen dosyalar: %s-%s-%s\n" @@ -836,7 +836,7 @@ msgstr "%s'den ba msgid "Could not open %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, c-format msgid "Unable to write package: %s\n" msgstr "paket yazýlamadý: %s\n" @@ -866,7 +866,7 @@ msgstr "%s'den payload okunamad msgid "Unable to write payload to %s: %s\n" msgstr "%s'e payload yazýlamadý: %s\n" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "Yazýldý: %s\n" @@ -1446,105 +1446,95 @@ msgstr "" msgid " failed - " msgstr " baþarýsýz - " -#: lib/depends.c:114 +#: 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:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, fuzzy, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "%s zaten kurulu" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 #, fuzzy msgid "(rpmrc provides)" msgstr "%s: %-45s EVET (rpmrc saðlar)\n" -#: lib/depends.c:757 +#: lib/depends.c:724 #, fuzzy msgid "(rpmlib provides)" msgstr "%s: %-45s EVET (rpmlib saðlar)\n" -#: lib/depends.c:778 +#: lib/depends.c:745 #, fuzzy msgid "(db files)" msgstr "db dosyasý %s hatalý\n" -#: lib/depends.c:790 +#: lib/depends.c:757 #, fuzzy msgid "(db provides)" msgstr "%s: %-45s EVET (db saðlar)\n" -#: lib/depends.c:803 +#: lib/depends.c:770 #, fuzzy msgid "(db package)" msgstr "paket yok\n" -#: lib/depends.c:842 +#: lib/depends.c:809 #, 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:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "HAYIR " -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "EVET" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, 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:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "========== tsort baðýntýlarý kaydediliyor\n" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" "========== paketler tsort'lanýyor (sýra, #öncüller, #ardýllar, derinlik)\n" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "========== sadece ardýllar (sunum sýrasý)\n" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "ÇEVRÝM:\n" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "========== tsort sürüyor ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "(bir sayý deðil)" @@ -1638,88 +1628,88 @@ msgstr "%s %s olarak olu #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE sayýsý 1 olmalý.\n" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "%d veri türü desteklenmiyor\n" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "%% den sonraki { yok" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "%%{ den sonraki } yok" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "etiket biçemi boþ" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "etiket ismi boþ" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "bilinmeyen etiket" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "dizinin sonunda ] gerekli" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "beklenmeyen ]" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "beklenmeyen }" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "ifade içerisinde ? gerekli" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "ifade içerisinde ? dan sonra { gerekli" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "ifade içinde } gerekli" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "? alt ifadesinden sonra : gerekli" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "ifade içersinde : den sonra { gerekli" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "ifadenin sonunda | gerekli" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "(bilinmeyen tür)" @@ -2250,108 +2240,108 @@ msgstr " %s-%s-%s ile msgid "is needed by" msgstr " %s-%s-%s için gerekli\n" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "========== yeniden konumlama\n" -#: lib/psm.c:276 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "%5d %s'i dýþlýyor\n" -#: lib/psm.c:279 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "%5d yeniden konumlandýrýlýyor: %s -> %s\n" -#: lib/psm.c:349 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "multilib dosya yolu dýþlanýyor %s%s\n" -#: lib/psm.c:415 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "%s %s dýþlanýyor\n" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "%s %s'e konumlanýyor\n" -#: lib/psm.c:504 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "%s dizini %s de yeniden konumlanýyor\n" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "%%%s dosyasý oluþturulamýyor: %s\n" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "%%%s dosyasýna yazýlamaz %s\n" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "kaynak paketi gerekirken çalýþtýrýlabilir paketi bulundu\n" -#: lib/psm.c:1324 +#: lib/psm.c:1316 msgid "source package contains no .spec file\n" msgstr "kaynak paketi .spec dosyasý içermiyor\n" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, fuzzy, c-format msgid "%s: running %s scriptlet\n" msgstr "%s: %s betiði çalýþtýrýlýyor (varsa)\n" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "%s betiðinin %s-%s-%s'den icrasý baþarýsýz, waitpid sonucu %s\n" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "%s betiðinin %s-%s-%s'den icrasý baþarýsýz, çýkýþta durum %d\n" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "%s: %s-%s-%s %d dosya içeriyor, test = %d\n" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "%s: %s betiði baþarýsýz (%d), %s-%s-%s atlanýyor\n" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "kullanýcý %s yok - root kullanýlacak\n" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "grup %s yok - root kullanýlacak\n" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "arþiv paketi açýlýrken baþarýsýz%s%s: %s\n" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr " dosyada " -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s baþarýsýz\n" @@ -2478,12 +2468,12 @@ msgstr "%u. kay msgid "package %s is not installed\n" msgstr "%s paketi kurulu deðil\n" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 #, fuzzy msgid "(added files)" msgstr "db dosyasý %s hatalý\n" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 #, fuzzy msgid "(added provide)" msgstr "%s: %-45s EVET (db saðlar)\n" @@ -2552,7 +2542,7 @@ msgid "OK" msgstr "Tamam" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, fuzzy, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" @@ -2561,13 +2551,13 @@ msgstr "" "\"B\" baðýmlýlýðý bir dönemsellik gerektirir (tabii ki \"A\" da)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s-%s-%s gereksinimi tatmin edici deðil: %s\n" @@ -2899,13 +2889,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "Ýmza: boyut(%d)+iz(%d)\n" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "missingok flamasýndan dolayý %s atlandý\n" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "%s dizini dýþlanýyor\n" @@ -2928,7 +2918,7 @@ msgstr "eksik %s" #: lib/verify.c:518 #, fuzzy, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "%s-%s-%s için tatmin edici olmayan baðýmlýlýklar: " #: lib/verify.c:556 diff --git a/po/uk.po b/po/uk.po index d831683..13f84c1 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -596,88 +596,88 @@ msgstr "" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1519 +#: build/files.c:1523 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1678 +#: build/files.c:1682 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1701 +#: build/files.c:1705 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1716 +#: build/files.c:1720 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1778 +#: build/files.c:1782 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2162 +#: build/files.c:2166 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2241 +#: build/files.c:2245 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2325 +#: build/files.c:2329 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2329 +#: build/files.c:2333 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,99 +1410,89 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:114 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:757 +#: lib/depends.c:724 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:778 +#: lib/depends.c:745 msgid "(db files)" msgstr "" -#: lib/depends.c:790 +#: lib/depends.c:757 msgid "(db provides)" msgstr "" -#: lib/depends.c:803 +#: lib/depends.c:770 msgid "(db package)" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:809 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "" @@ -1593,88 +1583,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "" @@ -2183,108 +2173,108 @@ msgstr "" msgid "is needed by" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:276 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:279 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:349 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:415 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:504 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1324 +#: lib/psm.c:1316 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2411,11 +2401,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 msgid "(added files)" msgstr "" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 msgid "(added provide)" msgstr "" @@ -2483,20 +2473,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2825,13 +2815,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -2851,7 +2841,7 @@ msgstr "" #: lib/verify.c:518 #, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "" #: lib/verify.c:556 diff --git a/po/wa.po b/po/wa.po index d831683..13f84c1 100644 --- a/po/wa.po +++ b/po/wa.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -596,88 +596,88 @@ msgstr "" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1519 +#: build/files.c:1523 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1678 +#: build/files.c:1682 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1701 +#: build/files.c:1705 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1716 +#: build/files.c:1720 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1778 +#: build/files.c:1782 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2162 +#: build/files.c:2166 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2241 +#: build/files.c:2245 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2325 +#: build/files.c:2329 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2329 +#: build/files.c:2333 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,99 +1410,89 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:114 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:757 +#: lib/depends.c:724 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:778 +#: lib/depends.c:745 msgid "(db files)" msgstr "" -#: lib/depends.c:790 +#: lib/depends.c:757 msgid "(db provides)" msgstr "" -#: lib/depends.c:803 +#: lib/depends.c:770 msgid "(db package)" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:809 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "" @@ -1593,88 +1583,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "" @@ -2183,108 +2173,108 @@ msgstr "" msgid "is needed by" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:276 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:279 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:349 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:415 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:504 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1324 +#: lib/psm.c:1316 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2411,11 +2401,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 msgid "(added files)" msgstr "" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 msgid "(added provide)" msgstr "" @@ -2483,20 +2473,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2825,13 +2815,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -2851,7 +2841,7 @@ msgstr "" #: lib/verify.c:518 #, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "" #: lib/verify.c:556 diff --git a/po/zh.po b/po/zh.po index d831683..13f84c1 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2001-11-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -596,88 +596,88 @@ msgstr "" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1519 +#: build/files.c:1523 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1678 +#: build/files.c:1682 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1701 +#: build/files.c:1705 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1716 +#: build/files.c:1720 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1778 +#: build/files.c:1782 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2162 +#: build/files.c:2166 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2241 +#: build/files.c:2245 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2325 +#: build/files.c:2329 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2329 +#: build/files.c:2333 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,99 +1410,89 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:114 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:757 +#: lib/depends.c:724 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:778 +#: lib/depends.c:745 msgid "(db files)" msgstr "" -#: lib/depends.c:790 +#: lib/depends.c:757 msgid "(db provides)" msgstr "" -#: lib/depends.c:803 +#: lib/depends.c:770 msgid "(db package)" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:809 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "" @@ -1593,88 +1583,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "" @@ -2183,108 +2173,108 @@ msgstr "" msgid "is needed by" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:276 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:279 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:349 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:415 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:504 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1324 +#: lib/psm.c:1316 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2411,11 +2401,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 msgid "(added files)" msgstr "" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 msgid "(added provide)" msgstr "" @@ -2483,20 +2473,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2825,13 +2815,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -2851,7 +2841,7 @@ msgstr "" #: lib/verify.c:518 #, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "" #: lib/verify.c:556 diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index d831683..13f84c1 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-09 20:32-0500\n" +"POT-Creation-Date: 2001-11-11 07:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -596,88 +596,88 @@ msgstr "" msgid "Symlink points to BuildRoot: %s -> %s\n" msgstr "" -#: build/files.c:1495 +#: build/files.c:1499 #, c-format msgid "File doesn't match prefix (%s): %s\n" msgstr "" -#: build/files.c:1519 +#: build/files.c:1523 #, c-format msgid "File not found: %s\n" msgstr "" -#: build/files.c:1562 build/files.c:2174 build/parsePrep.c:50 +#: build/files.c:1566 build/files.c:2178 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" -#: build/files.c:1574 +#: build/files.c:1578 #, c-format msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1678 +#: build/files.c:1682 #, c-format msgid "File needs leading \"/\": %s\n" msgstr "" -#: build/files.c:1701 +#: build/files.c:1705 #, c-format msgid "Glob not permitted: %s\n" msgstr "" -#: build/files.c:1716 +#: build/files.c:1720 #, c-format msgid "File not found by glob: %s\n" msgstr "" -#: build/files.c:1778 +#: build/files.c:1782 #, c-format msgid "Could not open %%files file %s: %s\n" msgstr "" -#: build/files.c:1789 build/pack.c:146 +#: build/files.c:1793 build/pack.c:146 #, c-format msgid "line: %s\n" msgstr "" -#: build/files.c:2162 +#: build/files.c:2166 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2236 +#: build/files.c:2240 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2241 +#: build/files.c:2245 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2325 +#: build/files.c:2329 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2329 +#: build/files.c:2333 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2465 +#: build/files.c:2469 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2491 build/files.c:2505 +#: build/files.c:2495 build/files.c:2509 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2626 +#: build/files.c:2630 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -816,7 +816,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:2146 +#: build/pack.c:603 lib/psm.c:2138 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -846,7 +846,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:2411 +#: build/pack.c:683 lib/psm.c:2403 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1410,99 +1410,89 @@ msgstr "" msgid " failed - " msgstr "" -#: lib/depends.c:114 +#: lib/depends.c:112 #, c-format msgid "cannot open Packages database in %s\n" msgstr "" -#: lib/depends.c:354 -#, c-format -msgid "newer package %s already added, skipping %s\n" -msgstr "" - -#: lib/depends.c:359 +#: lib/depends.c:414 #, c-format -msgid "package %s already added, ignoring\n" +msgid "package %s was already added, replacing with %s\n" msgstr "" -#: lib/depends.c:364 -#, c-format -msgid "older package %s already added, replacing with %s\n" -msgstr "" - -#: lib/depends.c:716 +#: lib/depends.c:683 msgid "(cached)" msgstr "" -#: lib/depends.c:741 +#: lib/depends.c:708 msgid "(rpmrc provides)" msgstr "" -#: lib/depends.c:757 +#: lib/depends.c:724 msgid "(rpmlib provides)" msgstr "" -#: lib/depends.c:778 +#: lib/depends.c:745 msgid "(db files)" msgstr "" -#: lib/depends.c:790 +#: lib/depends.c:757 msgid "(db provides)" msgstr "" -#: lib/depends.c:803 +#: lib/depends.c:770 msgid "(db package)" msgstr "" -#: lib/depends.c:842 +#: lib/depends.c:809 #, c-format msgid "%9s: (%s, %s) added to Depends cache.\n" msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "NO " msgstr "" -#: lib/depends.c:844 lib/rpmds.c:468 lib/rpmds.c:625 +#: lib/depends.c:811 lib/rpmds.c:569 lib/rpmds.c:727 msgid "YES" msgstr "" -#: lib/depends.c:1178 +#: lib/depends.c:1153 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1424 +#: lib/depends.c:1386 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1497 +#: lib/depends.c:1457 msgid "" "========== tsorting packages (order, #predecessors, #succesors, depth)\n" msgstr "" -#: lib/depends.c:1572 +#: lib/depends.c:1532 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1633 +#: lib/depends.c:1592 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1668 +#: lib/depends.c:1627 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1673 +#: lib/depends.c:1632 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: lib/header.c:2962 lib/header.c:2983 lib/header.c:3005 +#: lib/header.c:2963 lib/header.c:2984 lib/header.c:3006 msgid "(not a number)" msgstr "" @@ -1593,88 +1583,88 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: lib/header.c:346 +#: lib/header.c:347 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-modfilesys@ -#: lib/header.c:383 lib/header_internal.c:161 lib/psm.c:956 +#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:954 #, c-format msgid "Data type %d not supported\n" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2219 +#: lib/header.c:2220 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2249 +#: lib/header.c:2250 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2263 +#: lib/header.c:2264 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2277 +#: lib/header.c:2278 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2294 +#: lib/header.c:2295 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2321 +#: lib/header.c:2322 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2339 +#: lib/header.c:2340 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2343 +#: lib/header.c:2344 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2409 +#: lib/header.c:2410 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2418 +#: lib/header.c:2419 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2431 lib/header.c:2473 +#: lib/header.c:2432 lib/header.c:2474 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2441 +#: lib/header.c:2442 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2458 +#: lib/header.c:2459 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: lib/header.c:2483 +#: lib/header.c:2484 msgid "| expected at end of expression" msgstr "" -#: lib/header.c:2706 +#: lib/header.c:2707 msgid "(unknown type)" msgstr "" @@ -2183,108 +2173,108 @@ msgstr "" msgid "is needed by" msgstr "" -#: lib/psm.c:272 +#: lib/psm.c:270 msgid "========== relocations\n" msgstr "" -#: lib/psm.c:276 +#: lib/psm.c:274 #, c-format msgid "%5d exclude %s\n" msgstr "" -#: lib/psm.c:279 +#: lib/psm.c:277 #, c-format msgid "%5d relocate %s -> %s\n" msgstr "" -#: lib/psm.c:349 +#: lib/psm.c:347 #, c-format msgid "excluding multilib path %s%s\n" msgstr "" -#: lib/psm.c:415 +#: lib/psm.c:413 #, c-format msgid "excluding %s %s\n" msgstr "" -#: lib/psm.c:425 +#: lib/psm.c:423 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: lib/psm.c:504 +#: lib/psm.c:502 #, c-format msgid "relocating directory %s to %s\n" msgstr "" -#: lib/psm.c:1153 +#: lib/psm.c:1151 #, c-format msgid "cannot create %%%s %s\n" msgstr "" -#: lib/psm.c:1159 +#: lib/psm.c:1157 #, c-format msgid "cannot write to %%%s %s\n" msgstr "" -#: lib/psm.c:1200 +#: lib/psm.c:1197 msgid "source package expected, binary found\n" msgstr "" -#: lib/psm.c:1324 +#: lib/psm.c:1316 msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:1434 +#: lib/psm.c:1426 #, c-format msgid "%s: running %s scriptlet\n" msgstr "" -#: lib/psm.c:1602 +#: lib/psm.c:1594 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n" msgstr "" -#: lib/psm.c:1609 +#: lib/psm.c:1601 #, c-format msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n" msgstr "" -#: lib/psm.c:1951 +#: lib/psm.c:1943 #, c-format msgid "%s: %s-%s-%s has %d files, test = %d\n" msgstr "" -#: lib/psm.c:2068 +#: lib/psm.c:2060 #, c-format msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n" msgstr "" -#: lib/psm.c:2182 +#: lib/psm.c:2174 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2191 +#: lib/psm.c:2183 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:2232 +#: lib/psm.c:2224 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:2233 +#: lib/psm.c:2225 msgid " on file " msgstr "" -#: lib/psm.c:2419 +#: lib/psm.c:2411 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:2422 +#: lib/psm.c:2414 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2411,11 +2401,11 @@ msgstr "" msgid "package %s is not installed\n" msgstr "" -#: lib/rpmal.c:695 +#: lib/rpmal.c:656 msgid "(added files)" msgstr "" -#: lib/rpmal.c:794 +#: lib/rpmal.c:755 msgid "(added provide)" msgstr "" @@ -2483,20 +2473,20 @@ msgid "OK" msgstr "" #. XXX legacy epoch-less requires/conflicts compatibility -#: lib/rpmds.c:595 +#: lib/rpmds.c:697 #, c-format msgid "" "the \"B\" dependency needs an epoch (assuming same as \"A\")\n" "\tA %s\tB %s\n" msgstr "" -#: lib/rpmds.c:624 +#: lib/rpmds.c:726 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:649 +#: lib/rpmds.c:750 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" @@ -2825,13 +2815,13 @@ msgstr "" msgid "Signature: UNKNOWN (%d)\n" msgstr "" -#: lib/transaction.c:252 +#: lib/transaction.c:204 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" #. @innercontinue@ -#: lib/transaction.c:905 +#: lib/transaction.c:874 #, c-format msgid "excluding directory %s\n" msgstr "" @@ -2851,7 +2841,7 @@ msgstr "" #: lib/verify.c:518 #, c-format -msgid "Unsatisifed dependencies for %s:" +msgid "Unsatisifed dependencies for %s: " msgstr "" #: lib/verify.c:556 diff --git a/rpm.spec b/rpm.spec index 32fd1e1..f2e2207 100644 --- a/rpm.spec +++ b/rpm.spec @@ -570,3 +570,4 @@ fi - header tag sets are per-transactionElement, not per-availablePackage. - no-brainer refcounts for rpmDepSet and rpmFNSet objects. - strip header tags for erased as well as installed transactionElements. +- common structure elements for unification of TFI_t and rpmFNSet. diff --git a/rpm.spec.in b/rpm.spec.in index bc63d34..7796042 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -570,3 +570,4 @@ fi - header tag sets are per-transactionElement, not per-availablePackage. - no-brainer refcounts for rpmDepSet and rpmFNSet objects. - strip header tags for erased as well as installed transactionElements. +- common structure elements for unification of TFI_t and rpmFNSet. -- 2.7.4