From aeb8ed2318f0a486ee258cc39f9546981386b957 Mon Sep 17 00:00:00 2001 From: jbj Date: Thu, 23 May 2002 19:42:23 +0000 Subject: [PATCH] Create rpmts-py.c. CVS patchset: 5446 CVS date: 2002/05/23 19:42:23 --- lib/psm.c | 12 +- lib/rpmds.c | 12 +- lib/rpmds.h | 3 + lib/rpmfi.c | 14 +- lib/rpmfi.h | 5 +- lib/rpmts.c | 6 +- lib/rpmts.h | 13 +- lib/transaction.c | 6 +- po/cs.po | 104 +++++----- po/da.po | 104 +++++----- po/de.po | 104 +++++----- po/fi.po | 104 +++++----- po/fr.po | 104 +++++----- po/gl.po | 104 +++++----- po/is.po | 104 +++++----- po/ja.po | 104 +++++----- po/ko.po | 106 +++++----- po/no.po | 104 +++++----- po/pl.po | 104 +++++----- po/pt_BR.po | 106 +++++----- po/ro.po | 104 +++++----- po/rpm.pot | 104 +++++----- po/ru.po | 104 +++++----- po/sk.po | 104 +++++----- po/sl.po | 106 +++++----- po/sr.po | 104 +++++----- po/sv.po | 104 +++++----- po/tr.po | 104 +++++----- python/Makefile.am | 2 +- python/Makefile.in | 8 +- python/header-py.c | 1 + python/rpmds-py.c | 47 +++-- python/rpmds-py.h | 4 + python/rpmmodule.c | 574 +---------------------------------------------------- python/rpmts-py.c | 555 +++++++++++++++++++++++++++++++++++++++++++++++++++ python/rpmts-py.h | 30 +++ 36 files changed, 1815 insertions(+), 1563 deletions(-) create mode 100644 python/rpmts-py.c create mode 100644 python/rpmts-py.h diff --git a/lib/psm.c b/lib/psm.c index 07f7e3d..f83f36c 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -763,7 +763,7 @@ static int runScript(PSM_t psm, Header h, FD_t fd; /*@-branchstate@*/ - if (makeTempFile((!rpmtsGetChrootDone(ts) ? rootDir : "/"), &fn, &fd)) { + if (makeTempFile((!rpmtsChrootDone(ts) ? rootDir : "/"), &fn, &fd)) { if (freePrefixes) free(prefixes); return 1; } @@ -780,7 +780,7 @@ static int runScript(PSM_t psm, Header h, xx = Fclose(fd); { const char * sn = fn; - if (!rpmtsGetChrootDone(ts) && rootDir != NULL && + if (!rpmtsChrootDone(ts) && rootDir != NULL && !(rootDir[0] == '/' && rootDir[1] == '\0')) { sn += strlen(rootDir)-1; @@ -802,7 +802,7 @@ static int runScript(PSM_t psm, Header h, argv[argc] = NULL; - scriptFd = rpmtsGetScriptFd(ts); + scriptFd = rpmtsScriptFd(ts); if (scriptFd != NULL) { if (rpmIsVerbose()) { out = fdDup(Fileno(scriptFd)); @@ -879,7 +879,7 @@ static int runScript(PSM_t psm, Header h, rootDir = strchr(rootDir, '/'); /*@fallthrough@*/ case URL_IS_UNKNOWN: - if (!rpmtsGetChrootDone(ts) && !(rootDir[0] == '/' && rootDir[1] == '\0')) { + if (!rpmtsChrootDone(ts) && !(rootDir[0] == '/' && rootDir[1] == '\0')) { /*@-superuser -noeffect @*/ xx = chroot(rootDir); /*@=superuser =noeffect @*/ @@ -1828,7 +1828,7 @@ psm->te->h = headerFree(psm->te->h, "psm->te->h"); case PSM_CHROOT_IN: { const char * rootDir = rpmtsRootDir(ts); /* Change root directory if requested and not already done. */ - if (rootDir != NULL && !rpmtsGetChrootDone(ts) && !psm->chrootDone) { + if (rootDir != NULL && !rpmtsChrootDone(ts) && !psm->chrootDone) { static int _loaded = 0; /* @@ -1852,7 +1852,7 @@ psm->te->h = headerFree(psm->te->h, "psm->te->h"); case PSM_CHROOT_OUT: /* Restore root directory if changed. */ if (psm->chrootDone) { - const char * currDir = rpmtsGetCurrDir(ts); + const char * currDir = rpmtsCurrDir(ts); /*@-superuser@*/ rc = chroot("."); /*@=superuser@*/ diff --git a/lib/rpmds.c b/lib/rpmds.c index a8bc3ab..a8e4206 100644 --- a/lib/rpmds.c +++ b/lib/rpmds.c @@ -20,13 +20,13 @@ static int _noisy_range_comparison_debug_message = 0; /*@unchecked@*/ -static int _ds_debug = 0; +int _rpmds_debug = 0; rpmds XrpmdsUnlink(rpmds ds, const char * msg, const char * fn, unsigned ln) { if (ds == NULL) return NULL; /*@-modfilesystem@*/ -if (_ds_debug && msg != NULL) +if (_rpmds_debug && msg != NULL) fprintf(stderr, "--> ds %p -- %d %s at %s:%u\n", ds, ds->nrefs, msg, fn, ln); /*@=modfilesystem@*/ ds->nrefs--; @@ -39,7 +39,7 @@ rpmds XrpmdsLink(rpmds ds, const char * msg, const char * fn, unsigned ln) ds->nrefs++; /*@-modfilesystem@*/ -if (_ds_debug && msg != NULL) +if (_rpmds_debug && msg != NULL) fprintf(stderr, "--> ds %p ++ %d %s at %s:%u\n", ds, ds->nrefs, msg, fn, ln); /*@=modfilesystem@*/ @@ -58,7 +58,7 @@ rpmds rpmdsFree(rpmds ds) return rpmdsUnlink(ds, ds->Type); /*@-modfilesystem@*/ -if (_ds_debug < 0) +if (_rpmds_debug < 0) fprintf(stderr, "*** ds %p\t%s[%d]\n", ds, ds->Type, ds->Count); /*@=modfilesystem@*/ @@ -166,7 +166,7 @@ rpmds rpmdsNew(Header h, rpmTag tagN, int scareMem) ds->Flags, ds->Count * sizeof(*ds->Flags)); /*@-modfilesystem@*/ -if (_ds_debug < 0) +if (_rpmds_debug < 0) fprintf(stderr, "*** ds %p\t%s[%d]\n", ds, ds->Type, ds->Count); /*@=modfilesystem@*/ @@ -444,7 +444,7 @@ int rpmdsNext(/*@null@*/ rpmds ds) ds->i = -1; /*@-modfilesystem @*/ -if (_ds_debug < 0 && i != -1) +if (_rpmds_debug < 0 && i != -1) fprintf(stderr, "*** ds %p\t%s[%d]: %s\n", ds, (ds->Type ? ds->Type : "?Type?"), i, (ds->DNEVR ? ds->DNEVR : "?DNEVR?")); /*@=modfilesystem @*/ diff --git a/lib/rpmds.h b/lib/rpmds.h index 3f11559..1ded5e9 100644 --- a/lib/rpmds.h +++ b/lib/rpmds.h @@ -6,6 +6,9 @@ * Structure(s) used for dependency tag sets. */ +/*@unchecked@*/ +extern int _rpmds_debug; + #if defined(_RPMDS_INTERNAL) /** * A package dependency set. diff --git a/lib/rpmfi.c b/lib/rpmfi.c index 496f760..741b5f9 100644 --- a/lib/rpmfi.c +++ b/lib/rpmfi.c @@ -28,13 +28,13 @@ /*@access rpmte @*/ /*@unchecked@*/ -static int _fi_debug = 0; +int _rpmfi_debug = 0; rpmfi XrpmfiUnlink(rpmfi fi, const char * msg, const char * fn, unsigned ln) { if (fi == NULL) return NULL; /*@-modfilesystem@*/ -if (_fi_debug && msg != NULL) +if (_rpmfi_debug && msg != NULL) fprintf(stderr, "--> fi %p -- %d %s at %s:%u\n", fi, fi->nrefs, msg, fn, ln); /*@=modfilesystem@*/ fi->nrefs--; @@ -46,7 +46,7 @@ rpmfi XrpmfiLink(rpmfi fi, const char * msg, const char * fn, unsigned ln) if (fi == NULL) return NULL; fi->nrefs++; /*@-modfilesystem@*/ -if (_fi_debug && msg != NULL) +if (_rpmfi_debug && msg != NULL) fprintf(stderr, "--> fi %p ++ %d %s at %s:%u\n", fi, fi->nrefs, msg, fn, ln); /*@=modfilesystem@*/ /*@-refcounttrans@*/ return fi; /*@=refcounttrans@*/ @@ -275,7 +275,7 @@ int rpmfiNext(rpmfi fi) fi->i = -1; /*@-modfilesystem @*/ -if (_fi_debug < 0 && i != -1) +if (_rpmfi_debug < 0 && i != -1) fprintf(stderr, "*** fi %p\t%s[%d] %s%s\n", fi, (fi->Type ? fi->Type : "?Type?"), i, (i >= 0 ? fi->dnl[fi->j] : ""), (i >= 0 ? fi->bnl[fi->i] : "")); /*@=modfilesystem @*/ @@ -313,7 +313,7 @@ int rpmfiNextD(rpmfi fi) fi->j = -1; /*@-modfilesystem @*/ -if (_fi_debug < 0 && j != -1) +if (_rpmfi_debug < 0 && j != -1) fprintf(stderr, "*** fi %p\t%s[%d]\n", fi, (fi->Type ? fi->Type : "?Type?"), j); /*@=modfilesystem @*/ @@ -816,7 +816,7 @@ rpmfi rpmfiFree(rpmfi fi, int freefimem) return rpmfiUnlink(fi, fi->Type); /*@-modfilesystem@*/ -if (_fi_debug < 0) +if (_rpmfi_debug < 0) fprintf(stderr, "*** fi %p\t%s[%d]\n", fi, fi->Type, fi->fc); /*@=modfilesystem@*/ @@ -1067,7 +1067,7 @@ if (fi->actions == NULL) exit: /*@-modfilesystem@*/ -if (_fi_debug < 0) +if (_rpmfi_debug < 0) fprintf(stderr, "*** fi %p\t%s[%d]\n", fi, Type, (fi ? fi->fc : 0)); /*@=modfilesystem@*/ diff --git a/lib/rpmfi.h b/lib/rpmfi.h index bac24b0..2590e3b 100644 --- a/lib/rpmfi.h +++ b/lib/rpmfi.h @@ -6,6 +6,9 @@ * Structure(s) used for file info tag sets. */ +/*@unchecked@*/ +extern int _rpmfi_debug; + #if defined(_RPMFI_INTERNAL) /** */ @@ -402,7 +405,7 @@ rpmfi rpmfiFree(/*@killref@*/ /*@only@*/ /*@null@*/ rpmfi fi, int freefimem) * @return new file set */ /*@null@*/ -rpmfi rpmfiNew(rpmts ts, /*@null@*/ rpmfi fi, +rpmfi rpmfiNew(/*@null@*/ rpmts ts, /*@null@*/ rpmfi fi, Header h, rpmTag tagN, int scareMem) /*@modifies ts, fi, h @*/; diff --git a/lib/rpmts.c b/lib/rpmts.c index 3f9873a..a93a7fc 100644 --- a/lib/rpmts.c +++ b/lib/rpmts.c @@ -448,7 +448,7 @@ void rpmtsSetRootDir(rpmts ts, const char * rootDir) } } -const char * rpmtsGetCurrDir(rpmts ts) +const char * rpmtsCurrDir(rpmts ts) { const char * currDir = NULL; if (ts != NULL) { @@ -466,7 +466,7 @@ void rpmtsSetCurrDir(rpmts ts, const char * currDir) } } -FD_t rpmtsGetScriptFd(rpmts ts) +FD_t rpmtsScriptFd(rpmts ts) { FD_t scriptFd = NULL; if (ts != NULL) { @@ -490,7 +490,7 @@ void rpmtsSetScriptFd(rpmts ts, FD_t scriptFd) } } -int rpmtsGetChrootDone(rpmts ts) +int rpmtsChrootDone(rpmts ts) { int chrootDone = 0; if (ts != NULL) { diff --git a/lib/rpmts.h b/lib/rpmts.h index 57095ef..e0d0690 100644 --- a/lib/rpmts.h +++ b/lib/rpmts.h @@ -124,10 +124,7 @@ struct rpmts_s { int delta; /*!< Delta for reallocation. */ int_32 tid; /*!< Transaction id. */ - int verify_legacy; /*!< Verify legacy signatures? */ - int nodigests; /*!< Verify digests? */ - int nosignatures; /*!< Verify signatures? */ - int vsflags; /*!< Signature verification flags. */ + int vsflags; /*!< Signature/digest verification flags. */ /*@observer@*/ /*@dependent@*/ /*@null@*/ const char * fn; /*!< Current package fn. */ @@ -142,7 +139,7 @@ struct rpmts_s { unsigned char pksignid[8]; /*!< Current pubkey fingerprint. */ /*@null@*/ - struct pgpDig_s * dig; /*!< Current signature/pubkey parametrs. */ + struct pgpDig_s * dig; /*!< Current signature/pubkey parameters. */ /*@refs@*/ int nrefs; /*!< Reference count. */ @@ -347,7 +344,7 @@ void rpmtsSetRootDir(rpmts ts, /*@null@*/ const char * rootDir) * @return transaction currDir */ /*@observer@*/ /*@null@*/ -const char * rpmtsGetCurrDir(rpmts ts) +const char * rpmtsCurrDir(rpmts ts) /*@*/; /** \ingroup rpmts @@ -364,7 +361,7 @@ void rpmtsSetCurrDir(rpmts ts, /*@null@*/ const char * currDir) * @return transaction script file handle */ /*@null@*/ -FD_t rpmtsGetScriptFd(rpmts ts) +FD_t rpmtsScriptFd(rpmts ts) /*@*/; /** \ingroup rpmts @@ -380,7 +377,7 @@ void rpmtsSetScriptFd(rpmts ts, /*@null@*/ FD_t scriptFd) * @param ts transaction set * @return chrootDone flag */ -int rpmtsGetChrootDone(rpmts ts) +int rpmtsChrootDone(rpmts ts) /*@*/; /** \ingroup rpmts diff --git a/lib/transaction.c b/lib/transaction.c index 2f07a5b..8046053 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -1100,7 +1100,7 @@ int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet) } pi = rpmteiFree(pi); - if (!rpmtsGetChrootDone(ts)) { + if (!rpmtsChrootDone(ts)) { const char * rootDir = rpmtsRootDir(ts); xx = chdir("/"); /*@-superuser -noeffect @*/ @@ -1265,8 +1265,8 @@ int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet) pi = rpmteiFree(pi); ps = rpmpsFree(ps); - if (rpmtsGetChrootDone(ts)) { - const char * currDir = rpmtsGetCurrDir(ts); + if (rpmtsChrootDone(ts)) { + const char * currDir = rpmtsCurrDir(ts); /*@-superuser -noeffect @*/ xx = chroot("."); /*@=superuser =noeffect @*/ diff --git a/po/cs.po b/po/cs.po index 4140fe3..48f44ff 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-19 19:37-0400\n" +"POT-Creation-Date: 2002-05-23 08:29-0400\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -2826,80 +2826,80 @@ msgstr "chyb msgid "Unsatisifed dependencies for %s: " msgstr "Nevyøe¹ené závislosti pro %s-%s-%s: " -#: rpmdb/db3.c:85 +#: rpmdb/db3.c:156 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "db%d chyba (%d) z %s: %s\n" -#: rpmdb/db3.c:88 +#: rpmdb/db3.c:159 #, c-format msgid "db%d error(%d): %s\n" msgstr "db%d chyba (%d): %s\n" -#: rpmdb/db3.c:114 +#: rpmdb/db3.c:185 #, c-format msgid "closed db environment %s/%s\n" msgstr "uzavøeno DB prostøedí %s/%s\n" -#: rpmdb/db3.c:132 +#: rpmdb/db3.c:203 #, c-format msgid "removed db environment %s/%s\n" msgstr "odstranìno db prostøedí %s/%s\n" -#: rpmdb/db3.c:172 +#: rpmdb/db3.c:243 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "otevírám db environment %s/%s %s\n" -#: rpmdb/db3.c:605 +#: rpmdb/db3.c:678 #, c-format msgid "closed db index %s/%s\n" msgstr "uzavøen db index %s/%s\n" -#: rpmdb/db3.c:672 +#: rpmdb/db3.c:745 #, c-format msgid "verified db index %s/%s\n" msgstr "uzavøen db index %s/%s\n" -#: rpmdb/db3.c:894 +#: rpmdb/db3.c:967 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "otevírám db index %s/%s %s mode=0x%x\n" -#: rpmdb/db3.c:1110 +#: rpmdb/db3.c:1183 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "nemohu zamknout databázi zámkem %s v %s/%s\n" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "exclusive" msgstr "výhradní" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "shared" msgstr "sdílený" -#: rpmdb/db3.c:1116 +#: rpmdb/db3.c:1189 #, c-format msgid "locked db index %s/%s\n" msgstr "uzamèen db index %s/%s\n" -#: rpmdb/dbconfig.c:390 +#: rpmdb/dbconfig.c:396 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "neznámá db volba: \"%s\" ignorována\n" -#: rpmdb/dbconfig.c:428 +#: rpmdb/dbconfig.c:434 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s má neplatnou numerickou hodnotu, pøeskoèeno\n" -#: rpmdb/dbconfig.c:437 +#: rpmdb/dbconfig.c:443 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s má moc velkou nebo moc malou long hodnotu, pøeskoèeno\n" -#: rpmdb/dbconfig.c:446 +#: rpmdb/dbconfig.c:452 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "%s má pøíli¹ velkou nebo moc malou celoèíselnou hodnotu, pøeskoèeno\n" @@ -2997,17 +2997,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "generovat hlavièky kompatibilní RPM verze 2 a 3" #. @-modfilesys@ -#: rpmdb/rpmdb.c:164 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: neznámá znaèka: \"%s\" ignorována\n" -#: rpmdb/rpmdb.c:236 +#: rpmdb/rpmdb.c:238 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "nemohu otevøít index %s pøi pou¾ívání db%d - %s (%d)\n" -#: rpmdb/rpmdb.c:258 +#: rpmdb/rpmdb.c:260 #, c-format msgid "cannot open %s index\n" msgstr "nemohu otevøít index %s\n" @@ -3016,8 +3016,8 @@ msgstr "nemohu otev msgid "no dbpath has been set\n" msgstr "nebyla nastavena dbpath\n" -#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034 -#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820 +#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2043 +#: rpmdb/rpmdb.c:2148 rpmdb/rpmdb.c:2835 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "chyba(%d) pøi získávání záznamu \"%s\" z indexu %s\n" @@ -3027,125 +3027,135 @@ msgstr "chyba(%d) p msgid "error(%d) storing record #%d into %s\n" msgstr "chyba(%d) pøi ukládání záznamu %s do %s\n" -#: rpmdb/rpmdb.c:1956 +#: rpmdb/rpmdb.c:1966 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "rpmdb: poru¹ená polo¾ka hlavièky #%u, pøeskakuji.\n" -#: rpmdb/rpmdb.c:2222 +#: rpmdb/rpmdb.c:2231 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: nemohu èíst hlavièku na adrese 0x%x\n" -#: rpmdb/rpmdb.c:2388 +#: rpmdb/rpmdb.c:2292 +#, fuzzy, c-format +msgid "error(%d) setting header #%d record for %s removal\n" +msgstr "chyba(%d) pøi získávání záznamu \"%s\" z indexu %s\n" + +#: rpmdb/rpmdb.c:2403 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstraòuji \"%s\" z indexu %s.\n" -#: rpmdb/rpmdb.c:2392 +#: rpmdb/rpmdb.c:2407 #, c-format msgid "removing %d entries from %s index.\n" msgstr "odstraòuji %d polo¾ek z indexu %s.\n" -#: rpmdb/rpmdb.c:2440 +#: rpmdb/rpmdb.c:2434 +#, fuzzy, c-format +msgid "error(%d) setting \"%s\" records from %s index\n" +msgstr "chyba(%d) pøi získávání záznamu \"%s\" z indexu %s\n" + +#: rpmdb/rpmdb.c:2455 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "chyba(%d) pøi ukládání záznamu %s do %s\n" -#: rpmdb/rpmdb.c:2450 +#: rpmdb/rpmdb.c:2465 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "chyba(%d) pøi odstraòování záznamu %s z %s\n" -#: rpmdb/rpmdb.c:2592 +#: rpmdb/rpmdb.c:2607 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "chyba(%d) pøi alokaci nové instance balíèku\n" -#: rpmdb/rpmdb.c:2796 +#: rpmdb/rpmdb.c:2811 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "pøidávám \"%s\" do indexu %s\n" -#: rpmdb/rpmdb.c:2800 +#: rpmdb/rpmdb.c:2815 #, c-format msgid "adding %d entries to %s index.\n" msgstr "pøidávám %d polo¾ek do indexu %s.\n" -#: rpmdb/rpmdb.c:2836 +#: rpmdb/rpmdb.c:2851 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "chyba(%d) pøi ukládání záznamu %s do %s\n" -#: rpmdb/rpmdb.c:3175 +#: rpmdb/rpmdb.c:3190 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "odstraòuji %s po úspì¹ném znovusestavení db3.\n" -#: rpmdb/rpmdb.c:3210 +#: rpmdb/rpmdb.c:3225 msgid "no dbpath has been set" msgstr "nebyla nastavena dbpath" -#: rpmdb/rpmdb.c:3237 +#: rpmdb/rpmdb.c:3252 #, c-format msgid "rebuilding database %s into %s\n" msgstr "databázi %s pøevádím do %s\n" -#: rpmdb/rpmdb.c:3241 +#: rpmdb/rpmdb.c:3256 #, c-format msgid "temporary database %s already exists\n" msgstr "doèasná databáze %s ji¾ existuje\n" -#: rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:3262 #, c-format msgid "creating directory %s\n" msgstr "vytváøím adresáø %s\n" -#: rpmdb/rpmdb.c:3249 +#: rpmdb/rpmdb.c:3264 #, c-format msgid "creating directory %s: %s\n" msgstr "vytváøím adresáø %s: %s\n" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "opening old database with dbapi %d\n" msgstr "otevírám starou databázi s dbapi %d\n" -#: rpmdb/rpmdb.c:3267 +#: rpmdb/rpmdb.c:3282 #, c-format msgid "opening new database with dbapi %d\n" msgstr "otevírám novou databázi s dbapi %d\n" -#: rpmdb/rpmdb.c:3291 +#: rpmdb/rpmdb.c:3306 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "záznam èíslo %d v databázi je chybný -- vynechávám.\n" -#: rpmdb/rpmdb.c:3331 +#: rpmdb/rpmdb.c:3346 #, c-format msgid "cannot add record originally at %u\n" msgstr "nemohu pøidat záznam - pùvodnì u %d\n" -#: rpmdb/rpmdb.c:3349 +#: rpmdb/rpmdb.c:3364 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "databázi nelze zvovu vytvoøit; pùvodní databáze zùstává na svém místì\n" -#: rpmdb/rpmdb.c:3357 +#: rpmdb/rpmdb.c:3372 msgid "failed to replace old database with new database!\n" msgstr "starou databázi nelze nahradit novou databází!\n" -#: rpmdb/rpmdb.c:3359 +#: rpmdb/rpmdb.c:3374 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "pro obnovení nahraïte soubory v %s soubory z %s" -#: rpmdb/rpmdb.c:3369 +#: rpmdb/rpmdb.c:3384 #, c-format msgid "removing directory %s\n" msgstr "ma¾u adresáø %s\n" -#: rpmdb/rpmdb.c:3371 +#: rpmdb/rpmdb.c:3386 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "nemohu odstranit adresáø %s: %s\n" diff --git a/po/da.po b/po/da.po index 286c813..8b54862 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-19 19:37-0400\n" +"POT-Creation-Date: 2002-05-23 08:29-0400\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -2845,80 +2845,80 @@ msgstr "manglende %s" msgid "Unsatisifed dependencies for %s: " msgstr "Ikke-tilfredsstillede afhængighedskrav for %s-%s-%s: " -#: rpmdb/db3.c:85 +#: rpmdb/db3.c:156 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "db%d fejl(%d) fra %s: %s\n" -#: rpmdb/db3.c:88 +#: rpmdb/db3.c:159 #, c-format msgid "db%d error(%d): %s\n" msgstr "db%d fejl(%d): %s\n" -#: rpmdb/db3.c:114 +#: rpmdb/db3.c:185 #, fuzzy, c-format msgid "closed db environment %s/%s\n" msgstr "lukkede db-miljø %s/%s\n" -#: rpmdb/db3.c:132 +#: rpmdb/db3.c:203 #, fuzzy, c-format msgid "removed db environment %s/%s\n" msgstr "fjernede db-miljø %s/%s\n" -#: rpmdb/db3.c:172 +#: rpmdb/db3.c:243 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "åbner db-miljø %s/%s %s\n" -#: rpmdb/db3.c:605 +#: rpmdb/db3.c:678 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "lukkede db-indeks %s/%s\n" -#: rpmdb/db3.c:672 +#: rpmdb/db3.c:745 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "lukkede db-indeks %s/%s\n" -#: rpmdb/db3.c:894 +#: rpmdb/db3.c:967 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "åbner db-indeks %s/%s %s mode=0x%x\n" -#: rpmdb/db3.c:1110 +#: rpmdb/db3.c:1183 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "kan ikke opnå %s lås på %s/%s\n" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "exclusive" msgstr "eksklusiv" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "shared" msgstr "delt" -#: rpmdb/db3.c:1116 +#: rpmdb/db3.c:1189 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "låste db-index %s/%s\n" -#: rpmdb/dbconfig.c:390 +#: rpmdb/dbconfig.c:396 #, fuzzy, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "ukendt db-tilvalg: \"%s\" ignoreret\n" -#: rpmdb/dbconfig.c:428 +#: rpmdb/dbconfig.c:434 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s har ugyldig talværdi, overspringes\n" -#: rpmdb/dbconfig.c:437 +#: rpmdb/dbconfig.c:443 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s har for stor eller lille 'long'-værdi, overspringes\n" -#: rpmdb/dbconfig.c:446 +#: rpmdb/dbconfig.c:452 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "%s har for stor eller lille heltalsværdi, overspringes\n" @@ -3018,17 +3018,17 @@ msgstr "" "generér hoveder, der er kompatible med (gamle) rpm[23]-indpakningsversioner" #. @-modfilesys@ -#: rpmdb/rpmdb.c:164 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: ukendt mærkenavn: \"%s\" ignoreret\n" -#: rpmdb/rpmdb.c:236 +#: rpmdb/rpmdb.c:238 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "kan ikke åbne '%s'-indeks ved brug af db%d - %s (%d)\n" -#: rpmdb/rpmdb.c:258 +#: rpmdb/rpmdb.c:260 #, c-format msgid "cannot open %s index\n" msgstr "kan ikke åbne '%s'-indeks\n" @@ -3037,8 +3037,8 @@ msgstr "kan ikke msgid "no dbpath has been set\n" msgstr "der er ikke sat nogen dbpath\n" -#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034 -#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820 +#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2043 +#: rpmdb/rpmdb.c:2148 rpmdb/rpmdb.c:2835 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n" @@ -3048,128 +3048,138 @@ msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n" msgid "error(%d) storing record #%d into %s\n" msgstr "fejl(%d) ved gemning af post %s i %s\n" -#: rpmdb/rpmdb.c:1956 +#: rpmdb/rpmdb.c:1966 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2222 +#: rpmdb/rpmdb.c:2231 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: kan ikke læse hoved ved 0x%x\n" -#: rpmdb/rpmdb.c:2388 +#: rpmdb/rpmdb.c:2292 +#, fuzzy, c-format +msgid "error(%d) setting header #%d record for %s removal\n" +msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n" + +#: rpmdb/rpmdb.c:2403 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "fjerner \"%s\" fra %s-indekset.\n" -#: rpmdb/rpmdb.c:2392 +#: rpmdb/rpmdb.c:2407 #, c-format msgid "removing %d entries from %s index.\n" msgstr "fjerne %d indgange fra %s-indekset.\n" -#: rpmdb/rpmdb.c:2440 +#: rpmdb/rpmdb.c:2434 +#, fuzzy, c-format +msgid "error(%d) setting \"%s\" records from %s index\n" +msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n" + +#: rpmdb/rpmdb.c:2455 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "fejl(%d) ved gemning af post %s i %s\n" -#: rpmdb/rpmdb.c:2450 +#: rpmdb/rpmdb.c:2465 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "fejl(%d) ved fjernelse af post %s fra %s\n" -#: rpmdb/rpmdb.c:2592 +#: rpmdb/rpmdb.c:2607 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "fejl(%d) under allokering af ny pakkeinstans\n" -#: rpmdb/rpmdb.c:2796 +#: rpmdb/rpmdb.c:2811 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" "tilføjer \"%s\" til '%s'-indekset.\n" "\n" -#: rpmdb/rpmdb.c:2800 +#: rpmdb/rpmdb.c:2815 #, c-format msgid "adding %d entries to %s index.\n" msgstr "tilføjer %d indgange til '%s'-indekset.\n" -#: rpmdb/rpmdb.c:2836 +#: rpmdb/rpmdb.c:2851 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "fejl(%d) ved gemning af post %s i %s\n" -#: rpmdb/rpmdb.c:3175 +#: rpmdb/rpmdb.c:3190 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "fjerner %s efter vellykket genopbygning af db3.\n" -#: rpmdb/rpmdb.c:3210 +#: rpmdb/rpmdb.c:3225 msgid "no dbpath has been set" msgstr "der ikke sat nogen dbpath" -#: rpmdb/rpmdb.c:3237 +#: rpmdb/rpmdb.c:3252 #, c-format msgid "rebuilding database %s into %s\n" msgstr "genopbygger database %s over i %s\n" -#: rpmdb/rpmdb.c:3241 +#: rpmdb/rpmdb.c:3256 #, c-format msgid "temporary database %s already exists\n" msgstr "den midlertidige database %s eksisterer allerede\n" -#: rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:3262 #, c-format msgid "creating directory %s\n" msgstr "" "opretter kataloget %s\n" "\n" -#: rpmdb/rpmdb.c:3249 +#: rpmdb/rpmdb.c:3264 #, c-format msgid "creating directory %s: %s\n" msgstr "opretter kataloget %s: %s\n" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "opening old database with dbapi %d\n" msgstr "åbner gammel database med dbapi %d\n" -#: rpmdb/rpmdb.c:3267 +#: rpmdb/rpmdb.c:3282 #, c-format msgid "opening new database with dbapi %d\n" msgstr "åbner ny database med dbapi %d\n" -#: rpmdb/rpmdb.c:3291 +#: rpmdb/rpmdb.c:3306 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "post nummer %d i databasen er fejlbehæftet -- overspringer.\n" -#: rpmdb/rpmdb.c:3331 +#: rpmdb/rpmdb.c:3346 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "kunne ikke tilføje posten, der tidligere var ved %d\n" -#: rpmdb/rpmdb.c:3349 +#: rpmdb/rpmdb.c:3364 msgid "failed to rebuild database: original database remains in place\n" msgstr "kunne ikke genopbygge database: original-databasen beholdes\n" -#: rpmdb/rpmdb.c:3357 +#: rpmdb/rpmdb.c:3372 msgid "failed to replace old database with new database!\n" msgstr "kunne ikke erstatte gammel database med ny database!\n" -#: rpmdb/rpmdb.c:3359 +#: rpmdb/rpmdb.c:3374 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "erstat filer i %s med filer fra %s for at genoprette" -#: rpmdb/rpmdb.c:3369 +#: rpmdb/rpmdb.c:3384 #, c-format msgid "removing directory %s\n" msgstr "fjerner kataloget %s\n" -#: rpmdb/rpmdb.c:3371 +#: rpmdb/rpmdb.c:3386 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunne ikke fjerne katalog %s: %s\n" diff --git a/po/de.po b/po/de.po index 7436542..201866d 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-19 19:37-0400\n" +"POT-Creation-Date: 2002-05-23 08:29-0400\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -3031,80 +3031,80 @@ msgstr "fehlende { nach %{" msgid "Unsatisifed dependencies for %s: " msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: " -#: rpmdb/db3.c:85 +#: rpmdb/db3.c:156 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db3.c:88 +#: rpmdb/db3.c:159 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db3.c:114 +#: rpmdb/db3.c:185 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:132 +#: rpmdb/db3.c:203 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:172 +#: rpmdb/db3.c:243 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/db3.c:605 +#: rpmdb/db3.c:678 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/db3.c:672 +#: rpmdb/db3.c:745 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/db3.c:894 +#: rpmdb/db3.c:967 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/db3.c:1110 +#: rpmdb/db3.c:1183 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "kann %s lock für die Datenbank nicht bekommen" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "exclusive" msgstr "exklusiv" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "shared" msgstr "geteilt" -#: rpmdb/db3.c:1116 +#: rpmdb/db3.c:1189 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/dbconfig.c:390 +#: rpmdb/dbconfig.c:396 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:428 +#: rpmdb/dbconfig.c:434 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:437 +#: rpmdb/dbconfig.c:443 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:446 +#: rpmdb/dbconfig.c:452 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3207,17 +3207,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:164 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:236 +#: rpmdb/rpmdb.c:238 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "kann Datei %s nicht öffnen: " -#: rpmdb/rpmdb.c:258 +#: rpmdb/rpmdb.c:260 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "Fehler: kann %s nicht öffnen\n" @@ -3227,8 +3227,8 @@ msgstr "Fehler: kann %s nicht msgid "no dbpath has been set\n" msgstr "»dbpath« ist nicht gesetzt" -#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034 -#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820 +#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2043 +#: rpmdb/rpmdb.c:2148 rpmdb/rpmdb.c:2835 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "Fehler beim Eintrag %s von %s" @@ -3238,130 +3238,140 @@ msgstr "Fehler beim Eintrag %s von %s" msgid "error(%d) storing record #%d into %s\n" msgstr "Fehler bei Schreiben des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:1956 +#: rpmdb/rpmdb.c:1966 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2222 +#: rpmdb/rpmdb.c:2231 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen" +#: rpmdb/rpmdb.c:2292 +#, fuzzy, c-format +msgid "error(%d) setting header #%d record for %s removal\n" +msgstr "Fehler beim Eintrag %s von %s" + # FIXME -#: rpmdb/rpmdb.c:2388 +#: rpmdb/rpmdb.c:2403 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" # FIXME -#: rpmdb/rpmdb.c:2392 +#: rpmdb/rpmdb.c:2407 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:2440 +#: rpmdb/rpmdb.c:2434 +#, fuzzy, c-format +msgid "error(%d) setting \"%s\" records from %s index\n" +msgstr "Fehler beim Eintrag %s von %s" + +#: rpmdb/rpmdb.c:2455 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "Fehler bei Schreiben des Eintrags %s nach %s" # FIXME -#: rpmdb/rpmdb.c:2450 +#: rpmdb/rpmdb.c:2465 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:2592 +#: rpmdb/rpmdb.c:2607 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "Fehler beim Suchen nach Paket %s\n" -#: rpmdb/rpmdb.c:2796 +#: rpmdb/rpmdb.c:2811 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" # FIXME -#: rpmdb/rpmdb.c:2800 +#: rpmdb/rpmdb.c:2815 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:2836 +#: rpmdb/rpmdb.c:2851 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "Fehler bei Schreiben des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:3175 +#: rpmdb/rpmdb.c:3190 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3210 +#: rpmdb/rpmdb.c:3225 msgid "no dbpath has been set" msgstr "»dbpath« ist nicht gesetzt" -#: rpmdb/rpmdb.c:3237 +#: rpmdb/rpmdb.c:3252 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3241 +#: rpmdb/rpmdb.c:3256 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "die temporäre Datenbank %s existiert schon" -#: rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:3262 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: rpmdb/rpmdb.c:3249 +#: rpmdb/rpmdb.c:3264 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3271 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3267 +#: rpmdb/rpmdb.c:3282 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3291 +#: rpmdb/rpmdb.c:3306 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" "Eintrag Nummer %d in der Datenback ist nicht in Ordnung -- wird übersprungen" -#: rpmdb/rpmdb.c:3331 +#: rpmdb/rpmdb.c:3346 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d" -#: rpmdb/rpmdb.c:3349 +#: rpmdb/rpmdb.c:3364 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3357 +#: rpmdb/rpmdb.c:3372 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3359 +#: rpmdb/rpmdb.c:3374 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3369 +#: rpmdb/rpmdb.c:3384 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" # , c-format -#: rpmdb/rpmdb.c:3371 +#: rpmdb/rpmdb.c:3386 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" diff --git a/po/fi.po b/po/fi.po index 5ce605a..f427c23 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-19 19:37-0400\n" +"POT-Creation-Date: 2002-05-23 08:29-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -2899,80 +2899,80 @@ msgstr "puuttuva '{' '%':n j msgid "Unsatisifed dependencies for %s: " msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:" -#: rpmdb/db3.c:85 +#: rpmdb/db3.c:156 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db3.c:88 +#: rpmdb/db3.c:159 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db3.c:114 +#: rpmdb/db3.c:185 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:132 +#: rpmdb/db3.c:203 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:172 +#: rpmdb/db3.c:243 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/db3.c:605 +#: rpmdb/db3.c:678 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/db3.c:672 +#: rpmdb/db3.c:745 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/db3.c:894 +#: rpmdb/db3.c:967 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/db3.c:1110 +#: rpmdb/db3.c:1183 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "en voi saada %s lukitusta tietokantaan" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "exclusive" msgstr "poissulkevaa" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "shared" msgstr "jaettua" -#: rpmdb/db3.c:1116 +#: rpmdb/db3.c:1189 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/dbconfig.c:390 +#: rpmdb/dbconfig.c:396 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:428 +#: rpmdb/dbconfig.c:434 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:437 +#: rpmdb/dbconfig.c:443 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:446 +#: rpmdb/dbconfig.c:452 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3074,17 +3074,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:164 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:236 +#: rpmdb/rpmdb.c:238 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "en voinut avata tiedostoa %s: " -#: rpmdb/rpmdb.c:258 +#: rpmdb/rpmdb.c:260 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "virhe: en voi avata %s\n" @@ -3094,8 +3094,8 @@ msgstr "virhe: en voi avata %s\n" msgid "no dbpath has been set\n" msgstr "dbpath ei ole asetettu" -#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034 -#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820 +#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2043 +#: rpmdb/rpmdb.c:2148 rpmdb/rpmdb.c:2835 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "virhe luettaessa tietuetta %s %s:stä" @@ -3105,124 +3105,134 @@ msgstr "virhe luettaessa tietuetta %s %s:st msgid "error(%d) storing record #%d into %s\n" msgstr "virhe talletettaessa tietuetta %s %s:ään" -#: rpmdb/rpmdb.c:1956 +#: rpmdb/rpmdb.c:1966 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2222 +#: rpmdb/rpmdb.c:2231 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "en voi lukea headeria %d:stä päivittäessä" -#: rpmdb/rpmdb.c:2388 +#: rpmdb/rpmdb.c:2292 +#, fuzzy, c-format +msgid "error(%d) setting header #%d record for %s removal\n" +msgstr "virhe luettaessa tietuetta %s %s:stä" + +#: rpmdb/rpmdb.c:2403 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2392 +#: rpmdb/rpmdb.c:2407 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2440 +#: rpmdb/rpmdb.c:2434 +#, fuzzy, c-format +msgid "error(%d) setting \"%s\" records from %s index\n" +msgstr "virhe luettaessa tietuetta %s %s:stä" + +#: rpmdb/rpmdb.c:2455 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "virhe talletettaessa tietuetta %s %s:ään" -#: rpmdb/rpmdb.c:2450 +#: rpmdb/rpmdb.c:2465 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2592 +#: rpmdb/rpmdb.c:2607 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "virhe etsittäessä pakettia %s\n" -#: rpmdb/rpmdb.c:2796 +#: rpmdb/rpmdb.c:2811 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2800 +#: rpmdb/rpmdb.c:2815 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2836 +#: rpmdb/rpmdb.c:2851 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "virhe talletettaessa tietuetta %s %s:ään" -#: rpmdb/rpmdb.c:3175 +#: rpmdb/rpmdb.c:3190 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3210 +#: rpmdb/rpmdb.c:3225 msgid "no dbpath has been set" msgstr "dbpath ei ole asetettu" -#: rpmdb/rpmdb.c:3237 +#: rpmdb/rpmdb.c:3252 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3241 +#: rpmdb/rpmdb.c:3256 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "väliaikainen tietokanta %s on jo olemassa" -#: rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:3262 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3249 +#: rpmdb/rpmdb.c:3264 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3271 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3267 +#: rpmdb/rpmdb.c:3282 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3291 +#: rpmdb/rpmdb.c:3306 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen" -#: rpmdb/rpmdb.c:3331 +#: rpmdb/rpmdb.c:3346 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "en voi lisätä tietuetta %d:stä" -#: rpmdb/rpmdb.c:3349 +#: rpmdb/rpmdb.c:3364 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3357 +#: rpmdb/rpmdb.c:3372 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3359 +#: rpmdb/rpmdb.c:3374 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3369 +#: rpmdb/rpmdb.c:3384 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3371 +#: rpmdb/rpmdb.c:3386 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "en voinut avata %s: %s" diff --git a/po/fr.po b/po/fr.po index 4549ef2..de05acc 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-19 19:37-0400\n" +"POT-Creation-Date: 2002-05-23 08:29-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2930,80 +2930,80 @@ msgstr "" msgid "Unsatisifed dependencies for %s: " msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/db3.c:85 +#: rpmdb/db3.c:156 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db3.c:88 +#: rpmdb/db3.c:159 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db3.c:114 +#: rpmdb/db3.c:185 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:132 +#: rpmdb/db3.c:203 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:172 +#: rpmdb/db3.c:243 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/db3.c:605 +#: rpmdb/db3.c:678 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/db3.c:672 +#: rpmdb/db3.c:745 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/db3.c:894 +#: rpmdb/db3.c:967 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/db3.c:1110 +#: rpmdb/db3.c:1183 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "exclusive" msgstr "" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "shared" msgstr "" -#: rpmdb/db3.c:1116 +#: rpmdb/db3.c:1189 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/dbconfig.c:390 +#: rpmdb/dbconfig.c:396 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:428 +#: rpmdb/dbconfig.c:434 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:437 +#: rpmdb/dbconfig.c:443 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:446 +#: rpmdb/dbconfig.c:452 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3105,17 +3105,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:164 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:236 +#: rpmdb/rpmdb.c:238 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:258 +#: rpmdb/rpmdb.c:260 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "impossible d'ouvrir: %s\n" @@ -3124,8 +3124,8 @@ msgstr "impossible d'ouvrir: %s\n" msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034 -#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820 +#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2043 +#: rpmdb/rpmdb.c:2148 rpmdb/rpmdb.c:2835 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "impossible d'ouvrir: %s\n" @@ -3135,124 +3135,134 @@ msgstr "impossible d'ouvrir: %s\n" msgid "error(%d) storing record #%d into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:1956 +#: rpmdb/rpmdb.c:1966 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2222 +#: rpmdb/rpmdb.c:2231 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: rpmdb/rpmdb.c:2388 +#: rpmdb/rpmdb.c:2292 +#, fuzzy, c-format +msgid "error(%d) setting header #%d record for %s removal\n" +msgstr "impossible d'ouvrir: %s\n" + +#: rpmdb/rpmdb.c:2403 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2392 +#: rpmdb/rpmdb.c:2407 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2440 +#: rpmdb/rpmdb.c:2434 +#, fuzzy, c-format +msgid "error(%d) setting \"%s\" records from %s index\n" +msgstr "impossible d'ouvrir: %s\n" + +#: rpmdb/rpmdb.c:2455 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2450 +#: rpmdb/rpmdb.c:2465 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2592 +#: rpmdb/rpmdb.c:2607 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: rpmdb/rpmdb.c:2796 +#: rpmdb/rpmdb.c:2811 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2800 +#: rpmdb/rpmdb.c:2815 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2836 +#: rpmdb/rpmdb.c:2851 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3175 +#: rpmdb/rpmdb.c:3190 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3210 +#: rpmdb/rpmdb.c:3225 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3237 +#: rpmdb/rpmdb.c:3252 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3241 +#: rpmdb/rpmdb.c:3256 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:3262 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3249 +#: rpmdb/rpmdb.c:3264 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3267 +#: rpmdb/rpmdb.c:3282 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3291 +#: rpmdb/rpmdb.c:3306 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3331 +#: rpmdb/rpmdb.c:3346 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3349 +#: rpmdb/rpmdb.c:3364 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3357 +#: rpmdb/rpmdb.c:3372 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3359 +#: rpmdb/rpmdb.c:3374 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3369 +#: rpmdb/rpmdb.c:3384 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3371 +#: rpmdb/rpmdb.c:3386 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "impossible d'ouvrir: %s\n" diff --git a/po/gl.po b/po/gl.po index fca7bdf..53c1ffb 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2002-05-19 19:37-0400\n" +"POT-Creation-Date: 2002-05-23 08:29-0400\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -2754,80 +2754,80 @@ msgstr "" msgid "Unsatisifed dependencies for %s: " msgstr "" -#: rpmdb/db3.c:85 +#: rpmdb/db3.c:156 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db3.c:88 +#: rpmdb/db3.c:159 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db3.c:114 +#: rpmdb/db3.c:185 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:132 +#: rpmdb/db3.c:203 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:172 +#: rpmdb/db3.c:243 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: rpmdb/db3.c:605 +#: rpmdb/db3.c:678 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:672 +#: rpmdb/db3.c:745 #, c-format msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:894 +#: rpmdb/db3.c:967 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1110 +#: rpmdb/db3.c:1183 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "exclusive" msgstr "" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "shared" msgstr "" -#: rpmdb/db3.c:1116 +#: rpmdb/db3.c:1189 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:390 +#: rpmdb/dbconfig.c:396 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:428 +#: rpmdb/dbconfig.c:434 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:437 +#: rpmdb/dbconfig.c:443 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:446 +#: rpmdb/dbconfig.c:452 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -2925,17 +2925,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:164 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:236 +#: rpmdb/rpmdb.c:238 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:258 +#: rpmdb/rpmdb.c:260 #, c-format msgid "cannot open %s index\n" msgstr "" @@ -2944,8 +2944,8 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034 -#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820 +#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2043 +#: rpmdb/rpmdb.c:2148 rpmdb/rpmdb.c:2835 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" @@ -2955,124 +2955,134 @@ msgstr "" msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:1956 +#: rpmdb/rpmdb.c:1966 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2222 +#: rpmdb/rpmdb.c:2231 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2388 +#: rpmdb/rpmdb.c:2292 +#, c-format +msgid "error(%d) setting header #%d record for %s removal\n" +msgstr "" + +#: rpmdb/rpmdb.c:2403 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2392 +#: rpmdb/rpmdb.c:2407 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2440 +#: rpmdb/rpmdb.c:2434 +#, c-format +msgid "error(%d) setting \"%s\" records from %s index\n" +msgstr "" + +#: rpmdb/rpmdb.c:2455 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2450 +#: rpmdb/rpmdb.c:2465 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2592 +#: rpmdb/rpmdb.c:2607 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2796 +#: rpmdb/rpmdb.c:2811 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2800 +#: rpmdb/rpmdb.c:2815 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2836 +#: rpmdb/rpmdb.c:2851 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3175 +#: rpmdb/rpmdb.c:3190 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3210 +#: rpmdb/rpmdb.c:3225 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3237 +#: rpmdb/rpmdb.c:3252 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3241 +#: rpmdb/rpmdb.c:3256 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:3262 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3249 +#: rpmdb/rpmdb.c:3264 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3267 +#: rpmdb/rpmdb.c:3282 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3291 +#: rpmdb/rpmdb.c:3306 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3331 +#: rpmdb/rpmdb.c:3346 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3349 +#: rpmdb/rpmdb.c:3364 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3357 +#: rpmdb/rpmdb.c:3372 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3359 +#: rpmdb/rpmdb.c:3374 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3369 +#: rpmdb/rpmdb.c:3384 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3371 +#: rpmdb/rpmdb.c:3386 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/is.po b/po/is.po index 6ba740e..f75b256 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-19 19:37-0400\n" +"POT-Creation-Date: 2002-05-23 08:29-0400\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -2773,80 +2773,80 @@ msgstr "vantar %s" msgid "Unsatisifed dependencies for %s: " msgstr "Óuppfyllt pakkaskilyrði fyrir %s-%s-%s: " -#: rpmdb/db3.c:85 +#: rpmdb/db3.c:156 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db3.c:88 +#: rpmdb/db3.c:159 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db3.c:114 +#: rpmdb/db3.c:185 #, c-format msgid "closed db environment %s/%s\n" msgstr "lokaði gagnagrunnsumhverfi %s/%s\n" -#: rpmdb/db3.c:132 +#: rpmdb/db3.c:203 #, c-format msgid "removed db environment %s/%s\n" msgstr "fjarlægði gagnagrunnsumhverfi %s/%s\n" -#: rpmdb/db3.c:172 +#: rpmdb/db3.c:243 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "opna gagnagrunnsumhverfi %s/%s %s\n" -#: rpmdb/db3.c:605 +#: rpmdb/db3.c:678 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:672 +#: rpmdb/db3.c:745 #, c-format msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:894 +#: rpmdb/db3.c:967 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1110 +#: rpmdb/db3.c:1183 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "exclusive" msgstr "einka" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "shared" msgstr "deildann" -#: rpmdb/db3.c:1116 +#: rpmdb/db3.c:1189 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:390 +#: rpmdb/dbconfig.c:396 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:428 +#: rpmdb/dbconfig.c:434 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:437 +#: rpmdb/dbconfig.c:443 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:446 +#: rpmdb/dbconfig.c:452 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -2944,17 +2944,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:164 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:236 +#: rpmdb/rpmdb.c:238 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "get ekki opnað %s index með db%d - %s (%d)\n" -#: rpmdb/rpmdb.c:258 +#: rpmdb/rpmdb.c:260 #, c-format msgid "cannot open %s index\n" msgstr "get ekki opnað %s index\n" @@ -2963,8 +2963,8 @@ msgstr "get ekki opna msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034 -#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820 +#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2043 +#: rpmdb/rpmdb.c:2148 rpmdb/rpmdb.c:2835 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" @@ -2974,124 +2974,134 @@ msgstr "" msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:1956 +#: rpmdb/rpmdb.c:1966 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2222 +#: rpmdb/rpmdb.c:2231 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2388 +#: rpmdb/rpmdb.c:2292 +#, c-format +msgid "error(%d) setting header #%d record for %s removal\n" +msgstr "" + +#: rpmdb/rpmdb.c:2403 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2392 +#: rpmdb/rpmdb.c:2407 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2440 +#: rpmdb/rpmdb.c:2434 +#, c-format +msgid "error(%d) setting \"%s\" records from %s index\n" +msgstr "" + +#: rpmdb/rpmdb.c:2455 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2450 +#: rpmdb/rpmdb.c:2465 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2592 +#: rpmdb/rpmdb.c:2607 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2796 +#: rpmdb/rpmdb.c:2811 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2800 +#: rpmdb/rpmdb.c:2815 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2836 +#: rpmdb/rpmdb.c:2851 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3175 +#: rpmdb/rpmdb.c:3190 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3210 +#: rpmdb/rpmdb.c:3225 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3237 +#: rpmdb/rpmdb.c:3252 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3241 +#: rpmdb/rpmdb.c:3256 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:3262 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3249 +#: rpmdb/rpmdb.c:3264 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3267 +#: rpmdb/rpmdb.c:3282 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3291 +#: rpmdb/rpmdb.c:3306 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3331 +#: rpmdb/rpmdb.c:3346 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3349 +#: rpmdb/rpmdb.c:3364 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3357 +#: rpmdb/rpmdb.c:3372 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3359 +#: rpmdb/rpmdb.c:3374 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3369 +#: rpmdb/rpmdb.c:3384 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3371 +#: rpmdb/rpmdb.c:3386 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index 0cb4113..4040ba9 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-19 19:37-0400\n" +"POT-Creation-Date: 2002-05-23 08:29-0400\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -2944,80 +2944,80 @@ msgstr "%s msgid "Unsatisifed dependencies for %s: " msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À­¤òËþ¤¿¤·¤Æ¤¤¤Þ¤»¤ó:" -#: rpmdb/db3.c:85 +#: rpmdb/db3.c:156 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db3.c:88 +#: rpmdb/db3.c:159 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db3.c:114 +#: rpmdb/db3.c:185 #, fuzzy, c-format msgid "closed db environment %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/db3.c:132 +#: rpmdb/db3.c:203 #, fuzzy, c-format msgid "removed db environment %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/db3.c:172 +#: rpmdb/db3.c:243 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/db3.c:605 +#: rpmdb/db3.c:678 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/db3.c:672 +#: rpmdb/db3.c:745 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/db3.c:894 +#: rpmdb/db3.c:967 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n" -#: rpmdb/db3.c:1110 +#: rpmdb/db3.c:1183 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "exclusive" msgstr "½ü³°" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "shared" msgstr "¶¦Í­" -#: rpmdb/db3.c:1116 +#: rpmdb/db3.c:1189 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/dbconfig.c:390 +#: rpmdb/dbconfig.c:396 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:428 +#: rpmdb/dbconfig.c:434 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:437 +#: rpmdb/dbconfig.c:443 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:446 +#: rpmdb/dbconfig.c:452 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3118,17 +3118,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:164 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:236 +#: rpmdb/rpmdb.c:238 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó %s:%d" -#: rpmdb/rpmdb.c:258 +#: rpmdb/rpmdb.c:260 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" @@ -3138,8 +3138,8 @@ msgstr "%s msgid "no dbpath has been set\n" msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034 -#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820 +#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2043 +#: rpmdb/rpmdb.c:2148 rpmdb/rpmdb.c:2835 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)" @@ -3149,126 +3149,136 @@ msgstr " msgid "error(%d) storing record #%d into %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " -#: rpmdb/rpmdb.c:1956 +#: rpmdb/rpmdb.c:1966 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2222 +#: rpmdb/rpmdb.c:2231 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:2388 +#: rpmdb/rpmdb.c:2292 +#, fuzzy, c-format +msgid "error(%d) setting header #%d record for %s removal\n" +msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)" + +#: rpmdb/rpmdb.c:2403 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2392 +#: rpmdb/rpmdb.c:2407 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "name ¥¤¥ó¥Ç¥Ã¥¯¥¹ºï½ü¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2440 +#: rpmdb/rpmdb.c:2434 +#, fuzzy, c-format +msgid "error(%d) setting \"%s\" records from %s index\n" +msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)" + +#: rpmdb/rpmdb.c:2455 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " -#: rpmdb/rpmdb.c:2450 +#: rpmdb/rpmdb.c:2465 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ëºï½ü¤Ç¥¨¥é¡¼" -#: rpmdb/rpmdb.c:2592 +#: rpmdb/rpmdb.c:2607 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n" -#: rpmdb/rpmdb.c:2796 +#: rpmdb/rpmdb.c:2811 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2800 +#: rpmdb/rpmdb.c:2815 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2836 +#: rpmdb/rpmdb.c:2851 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " -#: rpmdb/rpmdb.c:3175 +#: rpmdb/rpmdb.c:3190 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3210 +#: rpmdb/rpmdb.c:3225 msgid "no dbpath has been set" msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:3237 +#: rpmdb/rpmdb.c:3252 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rootdir %s Ãæ¤Ç¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3241 +#: rpmdb/rpmdb.c:3256 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "°ì»þŪ¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹" -#: rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:3262 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3249 +#: rpmdb/rpmdb.c:3264 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3271 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: rpmdb/rpmdb.c:3267 +#: rpmdb/rpmdb.c:3282 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: rpmdb/rpmdb.c:3291 +#: rpmdb/rpmdb.c:3306 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥­¥Ã¥×¤·¤Þ¤¹" -#: rpmdb/rpmdb.c:3331 +#: rpmdb/rpmdb.c:3346 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ­¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:3349 +#: rpmdb/rpmdb.c:3364 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "" "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Þ¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3357 +#: rpmdb/rpmdb.c:3372 msgid "failed to replace old database with new database!\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤­´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n" -#: rpmdb/rpmdb.c:3359 +#: rpmdb/rpmdb.c:3374 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ð¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤­´¹¤¨¤Þ¤¹" -#: rpmdb/rpmdb.c:3369 +#: rpmdb/rpmdb.c:3384 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3371 +#: rpmdb/rpmdb.c:3386 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n" diff --git a/po/ko.po b/po/ko.po index 663fbe2..5ff32e7 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-19 19:37-0400\n" +"POT-Creation-Date: 2002-05-23 08:29-0400\n" "PO-Revision-Date: 2001-09-07 22:03+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -2831,80 +2831,80 @@ msgstr " msgid "Unsatisifed dependencies for %s: " msgstr "%s-%s-%s ¿¡ ÀÇÁ¸¼º ¹®Á¦ ¹ß»ý: " -#: rpmdb/db3.c:85 +#: rpmdb/db3.c:156 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "%3$s ÀÇ db%1$d ¿À·ù(%2$d): %4$s\n" -#: rpmdb/db3.c:88 +#: rpmdb/db3.c:159 #, c-format msgid "db%d error(%d): %s\n" msgstr "db%d ¿À·ù(%d): %s\n" -#: rpmdb/db3.c:114 +#: rpmdb/db3.c:185 #, c-format msgid "closed db environment %s/%s\n" msgstr "´ÝÈù db ȯ°æ %s/%s\n" -#: rpmdb/db3.c:132 +#: rpmdb/db3.c:203 #, c-format msgid "removed db environment %s/%s\n" msgstr "»èÁ¦µÈ db ȯ°æ %s/%s\n" -#: rpmdb/db3.c:172 +#: rpmdb/db3.c:243 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "¿­¸° db ȯ°æ %s/%s\n" -#: rpmdb/db3.c:605 +#: rpmdb/db3.c:678 #, c-format msgid "closed db index %s/%s\n" msgstr "´ÝÈù db À妽º %s/%s\n" -#: rpmdb/db3.c:672 +#: rpmdb/db3.c:745 #, c-format msgid "verified db index %s/%s\n" msgstr "°ËÁõµÈ db À妽º %s/%s\n" -#: rpmdb/db3.c:894 +#: rpmdb/db3.c:967 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "¿­¸° db À妽º %s/%s %s ¸ðµå=0x%x\n" -#: rpmdb/db3.c:1110 +#: rpmdb/db3.c:1183 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "Àá°ÜÀÖ´Â %2$s/%3$s ÀÇ %1$s (À»)¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "exclusive" msgstr "Á¦¿ÜÇÔ(exclusive)" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "shared" msgstr "°øÀ¯µÊ" -#: rpmdb/db3.c:1116 +#: rpmdb/db3.c:1189 #, c-format msgid "locked db index %s/%s\n" msgstr "Àá±ä db À妽º %s/%s\n" -#: rpmdb/dbconfig.c:390 +#: rpmdb/dbconfig.c:396 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "ÀÎÁõµÇÁö ¾ÊÀº db ¿É¼Ç: \"%s\" (À»)¸¦ ¹«½ÃÇÕ´Ï´Ù.\n" -#: rpmdb/dbconfig.c:428 +#: rpmdb/dbconfig.c:434 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s (Àº)´Â ºÎÀûÇÕÇÑ ¼öÄ¡ °ªÀÔ´Ï´Ù, »ý·«ÇÕ´Ï´Ù\n" -#: rpmdb/dbconfig.c:437 +#: rpmdb/dbconfig.c:443 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s (Àº)´Â ³Ê¹« Å©°Å³ª ³Ê¹« ÀÛÀº Á¤¼ö(long) °ªÀÔ´Ï´Ù, »ý·«ÇÕ´Ï´Ù\n" -#: rpmdb/dbconfig.c:446 +#: rpmdb/dbconfig.c:452 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "%s (Àº)´Â ³Ê¹« Å©°Å³ª ³Ê¹« ÀÛÀº Á¤¼ö(int) °ªÀÔ´Ï´Ù, »ý·«ÇÕ´Ï´Ù\n" @@ -3004,19 +3004,19 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "(±âÁ¸ÀÇ) rpm[23] ÆÐŰ¡°ú ȣȯÇÏ´Â Çì´õ¸¦ »ý¼ºÇÕ´Ï´Ù" #. @-modfilesys@ -#: rpmdb/rpmdb.c:164 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" "DB ÅÂ±× ÃʱâÈ­[dbiTagsInit]: ÀÎÁõµÇÁö ¾ÊÀº ÅÂ±× À̸§: \"%s\" (Àº)´Â ¹«½ÃµË´Ï" "´Ù\n" -#: rpmdb/rpmdb.c:236 +#: rpmdb/rpmdb.c:238 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "db%2$d (À»)¸¦ ÀÌ¿ëÇÏ¿© %1$s À妽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù - %3$s (%4$d)\n" -#: rpmdb/rpmdb.c:258 +#: rpmdb/rpmdb.c:260 #, c-format msgid "cannot open %s index\n" msgstr "%s À妽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n" @@ -3025,8 +3025,8 @@ msgstr "%s msgid "no dbpath has been set\n" msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034 -#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820 +#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2043 +#: rpmdb/rpmdb.c:2148 rpmdb/rpmdb.c:2835 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" @@ -3037,125 +3037,137 @@ msgstr "" msgid "error(%d) storing record #%d into %s\n" msgstr "%3$s (À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:1956 +#: rpmdb/rpmdb.c:1966 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "rpmdb: ¼Õ»óµÈ Çì´õ #%u (ÀÌ)°¡ º¹±¸(retrieved)µÇ¾ú½À´Ï´Ù, »ý·«ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2222 +#: rpmdb/rpmdb.c:2231 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: 0x%x ÀÇ Çì´õ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2388 +#: rpmdb/rpmdb.c:2292 +#, fuzzy, c-format +msgid "error(%d) setting header #%d record for %s removal\n" +msgstr "" +"%3$s À妽º¿¡¼­ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" + +#: rpmdb/rpmdb.c:2403 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "%2$s À妽º¿¡¼­ \"%1$s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2392 +#: rpmdb/rpmdb.c:2407 #, c-format msgid "removing %d entries from %s index.\n" msgstr "%2$s À妽º¿¡¼­ %1$d Ç׸ñµé(entries)À» »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2440 +#: rpmdb/rpmdb.c:2434 +#, fuzzy, c-format +msgid "error(%d) setting \"%s\" records from %s index\n" +msgstr "" +"%3$s À妽º¿¡¼­ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" + +#: rpmdb/rpmdb.c:2455 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "%3$s (À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2450 +#: rpmdb/rpmdb.c:2465 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "%3$s ¿¡¼­ %2$s ·¹Äڵ带 »èÁ¦ÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2592 +#: rpmdb/rpmdb.c:2607 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "»õ·Î¿î ÆÐÅ°Áö¸¦ ¹èÄ¡ÇÏ´Â µµÁß ¿À·ù(%d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2796 +#: rpmdb/rpmdb.c:2811 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "%2$s À妽º¿¡ \"%1$s\" (À»)¸¦ Ãß°¡ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2800 +#: rpmdb/rpmdb.c:2815 #, c-format msgid "adding %d entries to %s index.\n" msgstr "%2$s À妽º¿¡ %1$d Ç׸ñµé(entries)À» Ãß°¡ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2836 +#: rpmdb/rpmdb.c:2851 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "%3$s (À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:3175 +#: rpmdb/rpmdb.c:3190 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "db3¸¦ À籸Ãà ÇÑ ÈÄ¿¡ %s (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3210 +#: rpmdb/rpmdb.c:3225 msgid "no dbpath has been set" msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù" -#: rpmdb/rpmdb.c:3237 +#: rpmdb/rpmdb.c:3252 #, c-format msgid "rebuilding database %s into %s\n" msgstr "%2$s ¿¡ µ¥ÀÌÅͺ£À̽º %1$s (À»)¸¦ À籸Ãà ÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3241 +#: rpmdb/rpmdb.c:3256 #, c-format msgid "temporary database %s already exists\n" msgstr "Àӽà µ¥ÀÌÅͺ£À̽º %s (ÀÌ)°¡ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:3262 #, c-format msgid "creating directory %s\n" msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3249 +#: rpmdb/rpmdb.c:3264 #, c-format msgid "creating directory %s: %s\n" msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÔ: %s\n" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "opening old database with dbapi %d\n" msgstr "dbapi %d (À»)¸¦ ÅëÇØ ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n" -#: rpmdb/rpmdb.c:3267 +#: rpmdb/rpmdb.c:3282 #, c-format msgid "opening new database with dbapi %d\n" msgstr "dbapi %d (À»)¸¦ ÅëÇØ »õ·Î¿î µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n" -#: rpmdb/rpmdb.c:3291 +#: rpmdb/rpmdb.c:3306 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "µ¥ÀÌÅͺ£À̽ºÀÇ ·¹ÄÚµå ¹øÈ£ %u (ÀÌ)°¡ À߸øµÇ¾ú½À´Ï´Ù -- »ý·«ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3331 +#: rpmdb/rpmdb.c:3346 #, c-format msgid "cannot add record originally at %u\n" msgstr "%u ¿¡ ·¹Äڵ带 Ãß°¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:3349 +#: rpmdb/rpmdb.c:3364 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "µ¥ÀÌÅͺ£À̽º¸¦ À籸ÃàÇϴµ¥ ½ÇÆÐÇÔ: ¿øº» µ¥ÀÌÅͺ£À̽º´Â ±×´ë·Î À¯ÁöµË´Ï´Ù\n" -#: rpmdb/rpmdb.c:3357 +#: rpmdb/rpmdb.c:3372 msgid "failed to replace old database with new database!\n" msgstr "ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ »õ·Î¿î µ¥ÀÌÅͺ£À̽º·Î ±³Ã¼Çϴµ¥ ½ÇÆÐÇß½À´Ï´Ù!\n" -#: rpmdb/rpmdb.c:3359 +#: rpmdb/rpmdb.c:3374 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "º¹±¸Çϱâ À§ÇØ $2$s ÀÇ ÆÄÀÏÀ» $1$s ÀÇ ÆÄÀÏ·Î ±³Ã¼ÇÕ´Ï´Ù" -#: rpmdb/rpmdb.c:3369 +#: rpmdb/rpmdb.c:3384 #, c-format msgid "removing directory %s\n" msgstr "%s µð·ºÅ丮¸¦ »èÁ¦ÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3371 +#: rpmdb/rpmdb.c:3386 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s µð·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆÐÇÔ: %s\n" diff --git a/po/no.po b/po/no.po index 14c5b3c..866df67 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-19 19:37-0400\n" +"POT-Creation-Date: 2002-05-23 08:29-0400\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -2800,80 +2800,80 @@ msgstr "mangler %s" msgid "Unsatisifed dependencies for %s: " msgstr "feilede avhengigheter:\n" -#: rpmdb/db3.c:85 +#: rpmdb/db3.c:156 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db3.c:88 +#: rpmdb/db3.c:159 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db3.c:114 +#: rpmdb/db3.c:185 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:132 +#: rpmdb/db3.c:203 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:172 +#: rpmdb/db3.c:243 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: rpmdb/db3.c:605 +#: rpmdb/db3.c:678 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:672 +#: rpmdb/db3.c:745 #, c-format msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:894 +#: rpmdb/db3.c:967 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1110 +#: rpmdb/db3.c:1183 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "exclusive" msgstr "" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "shared" msgstr "" -#: rpmdb/db3.c:1116 +#: rpmdb/db3.c:1189 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:390 +#: rpmdb/dbconfig.c:396 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:428 +#: rpmdb/dbconfig.c:434 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:437 +#: rpmdb/dbconfig.c:443 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:446 +#: rpmdb/dbconfig.c:452 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -2971,17 +2971,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "generer headere som er kompatible med (gamle) rpm[23] pakker" #. @-modfilesys@ -#: rpmdb/rpmdb.c:164 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:236 +#: rpmdb/rpmdb.c:238 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "kan ikke åpne %s-indeks ved bruk av db%d - %s (%d)\n" -#: rpmdb/rpmdb.c:258 +#: rpmdb/rpmdb.c:260 #, c-format msgid "cannot open %s index\n" msgstr "kan ikke åpne %s indeks\n" @@ -2990,8 +2990,8 @@ msgstr "kan ikke msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034 -#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820 +#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2043 +#: rpmdb/rpmdb.c:2148 rpmdb/rpmdb.c:2835 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" @@ -3001,124 +3001,134 @@ msgstr "" msgid "error(%d) storing record #%d into %s\n" msgstr "feil(%d) under lagring av post %s til %s\n" -#: rpmdb/rpmdb.c:1956 +#: rpmdb/rpmdb.c:1966 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2222 +#: rpmdb/rpmdb.c:2231 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2388 +#: rpmdb/rpmdb.c:2292 +#, fuzzy, c-format +msgid "error(%d) setting header #%d record for %s removal\n" +msgstr "feil(%d) under lagring av post %s til %s\n" + +#: rpmdb/rpmdb.c:2403 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2392 +#: rpmdb/rpmdb.c:2407 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2440 +#: rpmdb/rpmdb.c:2434 +#, fuzzy, c-format +msgid "error(%d) setting \"%s\" records from %s index\n" +msgstr "feil(%d) under fjerning av post %s fra %s\n" + +#: rpmdb/rpmdb.c:2455 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "feil(%d) under lagring av post %s til %s\n" -#: rpmdb/rpmdb.c:2450 +#: rpmdb/rpmdb.c:2465 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "feil(%d) under fjerning av post %s fra %s\n" -#: rpmdb/rpmdb.c:2592 +#: rpmdb/rpmdb.c:2607 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2796 +#: rpmdb/rpmdb.c:2811 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2800 +#: rpmdb/rpmdb.c:2815 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2836 +#: rpmdb/rpmdb.c:2851 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "feil(%d) under lagring av post %s til %s\n" -#: rpmdb/rpmdb.c:3175 +#: rpmdb/rpmdb.c:3190 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3210 +#: rpmdb/rpmdb.c:3225 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3237 +#: rpmdb/rpmdb.c:3252 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3241 +#: rpmdb/rpmdb.c:3256 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:3262 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3249 +#: rpmdb/rpmdb.c:3264 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3267 +#: rpmdb/rpmdb.c:3282 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3291 +#: rpmdb/rpmdb.c:3306 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3331 +#: rpmdb/rpmdb.c:3346 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3349 +#: rpmdb/rpmdb.c:3364 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3357 +#: rpmdb/rpmdb.c:3372 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3359 +#: rpmdb/rpmdb.c:3374 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3369 +#: rpmdb/rpmdb.c:3384 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3371 +#: rpmdb/rpmdb.c:3386 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/pl.po b/po/pl.po index e38c9b3..e03be88 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-19 19:37-0400\n" +"POT-Creation-Date: 2002-05-23 08:29-0400\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -2898,80 +2898,80 @@ msgstr "brak %s\n" msgid "Unsatisifed dependencies for %s: " msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: " -#: rpmdb/db3.c:85 +#: rpmdb/db3.c:156 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db3.c:88 +#: rpmdb/db3.c:159 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db3.c:114 +#: rpmdb/db3.c:185 #, fuzzy, c-format msgid "closed db environment %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: rpmdb/db3.c:132 +#: rpmdb/db3.c:203 #, fuzzy, c-format msgid "removed db environment %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: rpmdb/db3.c:172 +#: rpmdb/db3.c:243 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: rpmdb/db3.c:605 +#: rpmdb/db3.c:678 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: rpmdb/db3.c:672 +#: rpmdb/db3.c:745 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: rpmdb/db3.c:894 +#: rpmdb/db3.c:967 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "otwiernie bazê danych w trybie 0x%x w %s\n" -#: rpmdb/db3.c:1110 +#: rpmdb/db3.c:1183 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "exclusive" msgstr "" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "shared" msgstr "" -#: rpmdb/db3.c:1116 +#: rpmdb/db3.c:1189 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: rpmdb/dbconfig.c:390 +#: rpmdb/dbconfig.c:396 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:428 +#: rpmdb/dbconfig.c:434 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:437 +#: rpmdb/dbconfig.c:443 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:446 +#: rpmdb/dbconfig.c:452 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3072,17 +3072,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:164 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:236 +#: rpmdb/rpmdb.c:238 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "nie mo¿na otworzyæ %s przy %s:%d" -#: rpmdb/rpmdb.c:258 +#: rpmdb/rpmdb.c:260 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "nie mo¿na otworzyæ %s\n" @@ -3092,8 +3092,8 @@ msgstr "nie mo msgid "no dbpath has been set\n" msgstr "¶cie¿ka bazy danych nie zosta³a podana" -#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034 -#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820 +#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2043 +#: rpmdb/rpmdb.c:2148 rpmdb/rpmdb.c:2835 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "b³±d pobierania rekordu %s z %s" @@ -3103,125 +3103,135 @@ msgstr "b msgid "error(%d) storing record #%d into %s\n" msgstr "b³±d zapisywania rekordu %s do %s" -#: rpmdb/rpmdb.c:1956 +#: rpmdb/rpmdb.c:1966 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2222 +#: rpmdb/rpmdb.c:2231 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "nie mo¿na odczytaæ nag³ówka przy %d dla poszukiwania" -#: rpmdb/rpmdb.c:2388 +#: rpmdb/rpmdb.c:2292 +#, fuzzy, c-format +msgid "error(%d) setting header #%d record for %s removal\n" +msgstr "b³±d pobierania rekordu %s z %s" + +#: rpmdb/rpmdb.c:2403 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "usuwanie indeksu grupy\n" -#: rpmdb/rpmdb.c:2392 +#: rpmdb/rpmdb.c:2407 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "usuwanie indeksu nazw\n" -#: rpmdb/rpmdb.c:2440 +#: rpmdb/rpmdb.c:2434 +#, fuzzy, c-format +msgid "error(%d) setting \"%s\" records from %s index\n" +msgstr "b³±d pobierania rekordu %s z %s" + +#: rpmdb/rpmdb.c:2455 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "b³±d zapisywania rekordu %s do %s" -#: rpmdb/rpmdb.c:2450 +#: rpmdb/rpmdb.c:2465 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "b³±d usuwania rekordu %s z %s" -#: rpmdb/rpmdb.c:2592 +#: rpmdb/rpmdb.c:2607 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "b³±d szukania pakietu %s\n" -#: rpmdb/rpmdb.c:2796 +#: rpmdb/rpmdb.c:2811 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "zmiana nazwy %s na %s\n" -#: rpmdb/rpmdb.c:2800 +#: rpmdb/rpmdb.c:2815 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "zmiana nazwy %s na %s\n" -#: rpmdb/rpmdb.c:2836 +#: rpmdb/rpmdb.c:2851 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "b³±d zapisywania rekordu %s do %s" -#: rpmdb/rpmdb.c:3175 +#: rpmdb/rpmdb.c:3190 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3210 +#: rpmdb/rpmdb.c:3225 msgid "no dbpath has been set" msgstr "¶cie¿ka bazy danych nie zosta³a podana" -#: rpmdb/rpmdb.c:3237 +#: rpmdb/rpmdb.c:3252 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "odbudowywujê bazê danych w rootdir %s\n" -#: rpmdb/rpmdb.c:3241 +#: rpmdb/rpmdb.c:3256 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "tymczasowa baza danych %s ju¿ istnieje" -#: rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:3262 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3249 +#: rpmdb/rpmdb.c:3264 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3271 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "otwieranie starej bazy danych\n" -#: rpmdb/rpmdb.c:3267 +#: rpmdb/rpmdb.c:3282 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "otwieranie nowej bazy danych\n" -#: rpmdb/rpmdb.c:3291 +#: rpmdb/rpmdb.c:3306 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "rekord numer %d w bazie danych jest b³êdny -- rekord pominiêto" -#: rpmdb/rpmdb.c:3331 +#: rpmdb/rpmdb.c:3346 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "nie mo¿na dodaæ rekordu oryginalnie przy %d" -#: rpmdb/rpmdb.c:3349 +#: rpmdb/rpmdb.c:3364 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "przebudowanie bazy nie powiod³o siê; stara pozosta³a na miejscu\n" -#: rpmdb/rpmdb.c:3357 +#: rpmdb/rpmdb.c:3372 msgid "failed to replace old database with new database!\n" msgstr "zamiana starej bazy na now± nie powiod³a siê!\n" -#: rpmdb/rpmdb.c:3359 +#: rpmdb/rpmdb.c:3374 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "naprawcze zastêpowanie plików w %s plikami z %s" -#: rpmdb/rpmdb.c:3369 +#: rpmdb/rpmdb.c:3384 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3371 +#: rpmdb/rpmdb.c:3386 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 3bc816a..4e3c28a 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-19 19:37-0400\n" +"POT-Creation-Date: 2002-05-23 08:29-0400\n" #: build.c:40 #, fuzzy @@ -3054,80 +3054,80 @@ msgstr "" msgid "Unsatisifed dependencies for %s: " msgstr "lista dependncias do pacote" -#: rpmdb/db3.c:85 +#: rpmdb/db3.c:156 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db3.c:88 +#: rpmdb/db3.c:159 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db3.c:114 +#: rpmdb/db3.c:185 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:132 +#: rpmdb/db3.c:203 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:172 +#: rpmdb/db3.c:243 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/db3.c:605 +#: rpmdb/db3.c:678 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/db3.c:672 +#: rpmdb/db3.c:745 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/db3.c:894 +#: rpmdb/db3.c:967 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/db3.c:1110 +#: rpmdb/db3.c:1183 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "no foi passado pacote para desinstalao" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "exclusive" msgstr "" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "shared" msgstr "" -#: rpmdb/db3.c:1116 +#: rpmdb/db3.c:1189 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/dbconfig.c:390 +#: rpmdb/dbconfig.c:396 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:428 +#: rpmdb/dbconfig.c:434 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:437 +#: rpmdb/dbconfig.c:443 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:446 +#: rpmdb/dbconfig.c:452 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3229,19 +3229,19 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:164 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:236 +#: rpmdb/rpmdb.c:238 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:258 +#: rpmdb/rpmdb.c:260 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "No consegui abrir: %s\n" @@ -3251,8 +3251,8 @@ msgid "no dbpath has been set\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034 -#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820 +#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2043 +#: rpmdb/rpmdb.c:2148 rpmdb/rpmdb.c:2835 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "No consegui abrir: %s\n" @@ -3263,121 +3263,133 @@ msgstr "No consegui abrir: %s\n" msgid "error(%d) storing record #%d into %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:1956 +#: rpmdb/rpmdb.c:1966 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2222 +#: rpmdb/rpmdb.c:2231 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "no foi passado pacote para desinstalao" -#: rpmdb/rpmdb.c:2388 +# , c-format +#: rpmdb/rpmdb.c:2292 +#, fuzzy, c-format +msgid "error(%d) setting header #%d record for %s removal\n" +msgstr "No consegui abrir: %s\n" + +#: rpmdb/rpmdb.c:2403 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:2392 +#: rpmdb/rpmdb.c:2407 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:2440 +#: rpmdb/rpmdb.c:2434 +#, fuzzy, c-format +msgid "error(%d) setting \"%s\" records from %s index\n" +msgstr "No consegui abrir: %s\n" + +# , c-format +#: rpmdb/rpmdb.c:2455 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:2450 +#: rpmdb/rpmdb.c:2465 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:2592 +#: rpmdb/rpmdb.c:2607 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "no foi passado pacote para instalao" -#: rpmdb/rpmdb.c:2796 +#: rpmdb/rpmdb.c:2811 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:2800 +#: rpmdb/rpmdb.c:2815 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:2836 +#: rpmdb/rpmdb.c:2851 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:3175 +#: rpmdb/rpmdb.c:3190 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3210 +#: rpmdb/rpmdb.c:3225 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3237 +#: rpmdb/rpmdb.c:3252 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/rpmdb.c:3241 +#: rpmdb/rpmdb.c:3256 #, c-format msgid "temporary database %s already exists\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:3262 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:3249 +#: rpmdb/rpmdb.c:3264 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3271 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/rpmdb.c:3267 +#: rpmdb/rpmdb.c:3282 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/rpmdb.c:3291 +#: rpmdb/rpmdb.c:3306 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3331 +#: rpmdb/rpmdb.c:3346 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3349 +#: rpmdb/rpmdb.c:3364 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3357 +#: rpmdb/rpmdb.c:3372 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3359 +#: rpmdb/rpmdb.c:3374 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" @@ -3390,13 +3402,13 @@ msgstr "" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: rpmdb/rpmdb.c:3369 +#: rpmdb/rpmdb.c:3384 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "RPM verso %s\n" # , c-format -#: rpmdb/rpmdb.c:3371 +#: rpmdb/rpmdb.c:3386 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "No consegui abrir: %s\n" diff --git a/po/ro.po b/po/ro.po index a07329d..2a06262 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-19 19:37-0400\n" +"POT-Creation-Date: 2002-05-23 08:29-0400\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -2754,80 +2754,80 @@ msgstr "" msgid "Unsatisifed dependencies for %s: " msgstr "" -#: rpmdb/db3.c:85 +#: rpmdb/db3.c:156 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db3.c:88 +#: rpmdb/db3.c:159 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db3.c:114 +#: rpmdb/db3.c:185 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:132 +#: rpmdb/db3.c:203 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:172 +#: rpmdb/db3.c:243 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: rpmdb/db3.c:605 +#: rpmdb/db3.c:678 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:672 +#: rpmdb/db3.c:745 #, c-format msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:894 +#: rpmdb/db3.c:967 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1110 +#: rpmdb/db3.c:1183 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "exclusive" msgstr "" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "shared" msgstr "" -#: rpmdb/db3.c:1116 +#: rpmdb/db3.c:1189 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:390 +#: rpmdb/dbconfig.c:396 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:428 +#: rpmdb/dbconfig.c:434 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:437 +#: rpmdb/dbconfig.c:443 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:446 +#: rpmdb/dbconfig.c:452 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -2925,17 +2925,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:164 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:236 +#: rpmdb/rpmdb.c:238 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:258 +#: rpmdb/rpmdb.c:260 #, c-format msgid "cannot open %s index\n" msgstr "" @@ -2944,8 +2944,8 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034 -#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820 +#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2043 +#: rpmdb/rpmdb.c:2148 rpmdb/rpmdb.c:2835 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" @@ -2955,124 +2955,134 @@ msgstr "" msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:1956 +#: rpmdb/rpmdb.c:1966 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2222 +#: rpmdb/rpmdb.c:2231 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2388 +#: rpmdb/rpmdb.c:2292 +#, c-format +msgid "error(%d) setting header #%d record for %s removal\n" +msgstr "" + +#: rpmdb/rpmdb.c:2403 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2392 +#: rpmdb/rpmdb.c:2407 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2440 +#: rpmdb/rpmdb.c:2434 +#, c-format +msgid "error(%d) setting \"%s\" records from %s index\n" +msgstr "" + +#: rpmdb/rpmdb.c:2455 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2450 +#: rpmdb/rpmdb.c:2465 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2592 +#: rpmdb/rpmdb.c:2607 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2796 +#: rpmdb/rpmdb.c:2811 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2800 +#: rpmdb/rpmdb.c:2815 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2836 +#: rpmdb/rpmdb.c:2851 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3175 +#: rpmdb/rpmdb.c:3190 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3210 +#: rpmdb/rpmdb.c:3225 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3237 +#: rpmdb/rpmdb.c:3252 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3241 +#: rpmdb/rpmdb.c:3256 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:3262 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3249 +#: rpmdb/rpmdb.c:3264 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3267 +#: rpmdb/rpmdb.c:3282 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3291 +#: rpmdb/rpmdb.c:3306 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3331 +#: rpmdb/rpmdb.c:3346 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3349 +#: rpmdb/rpmdb.c:3364 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3357 +#: rpmdb/rpmdb.c:3372 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3359 +#: rpmdb/rpmdb.c:3374 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3369 +#: rpmdb/rpmdb.c:3384 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3371 +#: rpmdb/rpmdb.c:3386 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index 21cbab8..7578e07 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-05-19 19:37-0400\n" +"POT-Creation-Date: 2002-05-23 08:29-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2760,80 +2760,80 @@ msgstr "" msgid "Unsatisifed dependencies for %s: " msgstr "" -#: rpmdb/db3.c:85 +#: rpmdb/db3.c:156 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db3.c:88 +#: rpmdb/db3.c:159 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db3.c:114 +#: rpmdb/db3.c:185 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:132 +#: rpmdb/db3.c:203 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:172 +#: rpmdb/db3.c:243 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "" -#: rpmdb/db3.c:605 +#: rpmdb/db3.c:678 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:672 +#: rpmdb/db3.c:745 #, c-format msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:894 +#: rpmdb/db3.c:967 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1110 +#: rpmdb/db3.c:1183 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "exclusive" msgstr "" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "shared" msgstr "" -#: rpmdb/db3.c:1116 +#: rpmdb/db3.c:1189 #, c-format msgid "locked db index %s/%s\n" msgstr "" -#: rpmdb/dbconfig.c:390 +#: rpmdb/dbconfig.c:396 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:428 +#: rpmdb/dbconfig.c:434 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:437 +#: rpmdb/dbconfig.c:443 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:446 +#: rpmdb/dbconfig.c:452 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -2931,17 +2931,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:164 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:236 +#: rpmdb/rpmdb.c:238 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:258 +#: rpmdb/rpmdb.c:260 #, c-format msgid "cannot open %s index\n" msgstr "" @@ -2950,8 +2950,8 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034 -#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820 +#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2043 +#: rpmdb/rpmdb.c:2148 rpmdb/rpmdb.c:2835 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" @@ -2961,124 +2961,134 @@ msgstr "" msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: rpmdb/rpmdb.c:1956 +#: rpmdb/rpmdb.c:1966 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2222 +#: rpmdb/rpmdb.c:2231 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2388 +#: rpmdb/rpmdb.c:2292 +#, c-format +msgid "error(%d) setting header #%d record for %s removal\n" +msgstr "" + +#: rpmdb/rpmdb.c:2403 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2392 +#: rpmdb/rpmdb.c:2407 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2440 +#: rpmdb/rpmdb.c:2434 +#, c-format +msgid "error(%d) setting \"%s\" records from %s index\n" +msgstr "" + +#: rpmdb/rpmdb.c:2455 #, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2450 +#: rpmdb/rpmdb.c:2465 #, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2592 +#: rpmdb/rpmdb.c:2607 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2796 +#: rpmdb/rpmdb.c:2811 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2800 +#: rpmdb/rpmdb.c:2815 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2836 +#: rpmdb/rpmdb.c:2851 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3175 +#: rpmdb/rpmdb.c:3190 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3210 +#: rpmdb/rpmdb.c:3225 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3237 +#: rpmdb/rpmdb.c:3252 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3241 +#: rpmdb/rpmdb.c:3256 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:3262 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3249 +#: rpmdb/rpmdb.c:3264 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3267 +#: rpmdb/rpmdb.c:3282 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3291 +#: rpmdb/rpmdb.c:3306 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:3331 +#: rpmdb/rpmdb.c:3346 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3349 +#: rpmdb/rpmdb.c:3364 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3357 +#: rpmdb/rpmdb.c:3372 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3359 +#: rpmdb/rpmdb.c:3374 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3369 +#: rpmdb/rpmdb.c:3384 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3371 +#: rpmdb/rpmdb.c:3386 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 88ae699..5fa349a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-19 19:37-0400\n" +"POT-Creation-Date: 2002-05-23 08:29-0400\n" "PO-Revision-Date: 2001-08-29 13:55-0400\n" "Last-Translator: Eugene Kanter \n" "Language-Team: Black Cat Linux Team \n" @@ -2839,80 +2839,80 @@ msgstr " msgid "Unsatisifed dependencies for %s: " msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: " -#: rpmdb/db3.c:85 +#: rpmdb/db3.c:156 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "ÏÛÉÂËÁ(%d) db%d ÉÚ %s: %s\n" -#: rpmdb/db3.c:88 +#: rpmdb/db3.c:159 #, c-format msgid "db%d error(%d): %s\n" msgstr "ÏÛÉÂËÁ(%d) db%d: %s\n" -#: rpmdb/db3.c:114 +#: rpmdb/db3.c:185 #, c-format msgid "closed db environment %s/%s\n" msgstr "ÚÁËÒÙÔÏ ÏËÒÕÖÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n" -#: rpmdb/db3.c:132 +#: rpmdb/db3.c:203 #, c-format msgid "removed db environment %s/%s\n" msgstr "ÕÄÁÌÅÎÏ ÏËÒÕÖÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n" -#: rpmdb/db3.c:172 +#: rpmdb/db3.c:243 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÏËÒÕÖÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s %s\n" -#: rpmdb/db3.c:605 +#: rpmdb/db3.c:678 #, c-format msgid "closed db index %s/%s\n" msgstr "ÚÁËÒÙÔ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n" -#: rpmdb/db3.c:672 +#: rpmdb/db3.c:745 #, c-format msgid "verified db index %s/%s\n" msgstr "ÐÒÏ×ÅÒÅÎ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n" -#: rpmdb/db3.c:894 +#: rpmdb/db3.c:967 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s %s mode=0x%x\n" -#: rpmdb/db3.c:1110 +#: rpmdb/db3.c:1183 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÂÌÏËÉÒÏ×ËÕ %s ÎÁ %s/%s\n" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "exclusive" msgstr "ÉÓËÌÀÞÉÔÅÌØÎÙÊ" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "shared" msgstr "ÒÁÚÄÅÌÑÅÍÙÊ" -#: rpmdb/db3.c:1116 +#: rpmdb/db3.c:1189 #, c-format msgid "locked db index %s/%s\n" msgstr "ÚÁÂÌÏËÉÒÏ×ÁÎ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n" -#: rpmdb/dbconfig.c:390 +#: rpmdb/dbconfig.c:396 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "ÎÅÏÐÏÚÎÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÂÁÚÙ ÄÁÎÎÙÈ: \"%s\" ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ\n" -#: rpmdb/dbconfig.c:428 +#: rpmdb/dbconfig.c:434 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "ÎÅ×ÅÒÎÏÅ ÞÉÓÌÏ×ÏÅ ÚÎÁÞÅÎÉÅ %s, ÐÒÏÐÕÝÅÎÏ\n" -#: rpmdb/dbconfig.c:437 +#: rpmdb/dbconfig.c:443 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s ÉÍÅÅÔ ÓÌÉÛËÏÍ ÍÁÌÕÀ ÉÌÉ ÓÌÉÛËÏÍ ÂÏÌØÛÕÀ ×ÅÌÉÞÉÎÕ long, ÐÒÏÐÕÝÅÎÏ\n" -#: rpmdb/dbconfig.c:446 +#: rpmdb/dbconfig.c:452 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3013,17 +3013,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "ÓÏÚÄÁÔØ ÚÁÇÏÌÏ×ËÉ, ÓÏ×ÍÅÓÔÉÍÙÅ Ó (ÕÓÔÁÒÅ×ÛÉÍÉ) ÐÁËÅÔÁÍÉ rpm[23]" #. @-modfilesys@ -#: rpmdb/rpmdb.c:164 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: ÉÍÑ ËÌÀÞÁ \"%s\" ÎÅ ÉÚ×ÅÓÔÎÏ, ÉÇÎÏÒÉÒÕÅÔÓÑ\n" -#: rpmdb/rpmdb.c:236 +#: rpmdb/rpmdb.c:238 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÄÅËÓ %s ÉÓÐÏÌØÚÕÑ db%d - %s (%d)\n" -#: rpmdb/rpmdb.c:258 +#: rpmdb/rpmdb.c:260 #, c-format msgid "cannot open %s index\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÄÅËÓ %s\n" @@ -3032,8 +3032,8 @@ msgstr " msgid "no dbpath has been set\n" msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" -#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034 -#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820 +#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2043 +#: rpmdb/rpmdb.c:2148 rpmdb/rpmdb.c:2835 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n" @@ -3043,125 +3043,135 @@ msgstr " msgid "error(%d) storing record #%d into %s\n" msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n" -#: rpmdb/rpmdb.c:1956 +#: rpmdb/rpmdb.c:1966 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "rpmdb: ÐÏÌÕÞÅÎ ÐÏ×ÒÅÖÄÅÎÎÙÊ ÚÁÇÏÌÏ×ÏË #%u, ÐÒÏÐÕÓËÁÅÔÓÑ.\n" -#: rpmdb/rpmdb.c:2222 +#: rpmdb/rpmdb.c:2231 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ ÚÁÇÏÌÏ×ÏË × 0x%x\n" -#: rpmdb/rpmdb.c:2388 +#: rpmdb/rpmdb.c:2292 +#, fuzzy, c-format +msgid "error(%d) setting header #%d record for %s removal\n" +msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n" + +#: rpmdb/rpmdb.c:2403 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "ÕÄÁÌÑÅÔÓÑ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s.\n" -#: rpmdb/rpmdb.c:2392 +#: rpmdb/rpmdb.c:2407 #, c-format msgid "removing %d entries from %s index.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ ÉÚ ÉÎÄÅËÓÁ %s.\n" -#: rpmdb/rpmdb.c:2440 +#: rpmdb/rpmdb.c:2434 +#, fuzzy, c-format +msgid "error(%d) setting \"%s\" records from %s index\n" +msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n" + +#: rpmdb/rpmdb.c:2455 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n" -#: rpmdb/rpmdb.c:2450 +#: rpmdb/rpmdb.c:2465 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "ÏÛÉÂËÁ(%d) ÕÄÁÌÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s\n" -#: rpmdb/rpmdb.c:2592 +#: rpmdb/rpmdb.c:2607 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "ÏÛÉÂËÁ(%d) ÒÅÚÅÒ×ÉÒÏ×ÁÎÉÑ ÐÁÍÑÔÉ ÄÌÑ ÏÂÒÁÚÁ ÎÏ×ÏÇÏ ÐÁËÅÔÁ\n" -#: rpmdb/rpmdb.c:2796 +#: rpmdb/rpmdb.c:2811 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ \"%s\" × ÉÎÄÅËÓ %s.\n" -#: rpmdb/rpmdb.c:2800 +#: rpmdb/rpmdb.c:2815 #, c-format msgid "adding %d entries to %s index.\n" msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ × ÉÎÄÅËÓ %s\n" -#: rpmdb/rpmdb.c:2836 +#: rpmdb/rpmdb.c:2851 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n" -#: rpmdb/rpmdb.c:3175 +#: rpmdb/rpmdb.c:3190 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s ÐÏÓÌÅ ÕÓÐÅÛÎÏÇÏ ÚÁ×ÅÒÛÅÎÉÑ ÐÅÒÅÉÎÄÅËÁÃÉÉ ÂÁÚÙ × db3.\n" -#: rpmdb/rpmdb.c:3210 +#: rpmdb/rpmdb.c:3225 msgid "no dbpath has been set" msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: rpmdb/rpmdb.c:3237 +#: rpmdb/rpmdb.c:3252 #, c-format msgid "rebuilding database %s into %s\n" msgstr "ÐÅÒÅÓÔÒÁÉ×ÁÅÔÓÑ ÂÁÚÁ ÄÁÎÎÙÈ %s × %s\n" -#: rpmdb/rpmdb.c:3241 +#: rpmdb/rpmdb.c:3256 #, c-format msgid "temporary database %s already exists\n" msgstr "×ÒÅÍÅÎÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ\n" -#: rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:3262 #, c-format msgid "creating directory %s\n" msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: rpmdb/rpmdb.c:3249 +#: rpmdb/rpmdb.c:3264 #, c-format msgid "creating directory %s: %s\n" msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s: %s\n" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "opening old database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: rpmdb/rpmdb.c:3267 +#: rpmdb/rpmdb.c:3282 #, c-format msgid "opening new database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÎÏ×ÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: rpmdb/rpmdb.c:3291 +#: rpmdb/rpmdb.c:3306 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "ÚÁÐÉÓØ ÎÏÍÅÒ %u × ÂÁÚÅ ÄÁÎÎÙÈ ÎÅ×ÅÒÎÁ, ÐÒÏÐÕÓËÁÅÔÓÑ.\n" -#: rpmdb/rpmdb.c:3331 +#: rpmdb/rpmdb.c:3346 #, c-format msgid "cannot add record originally at %u\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÚÁÐÉÓØ (ÐÅÒ×ÏÎÁÞÁÌØÎÏ × %u)\n" -#: rpmdb/rpmdb.c:3349 +#: rpmdb/rpmdb.c:3364 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "ÐÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n" -#: rpmdb/rpmdb.c:3357 +#: rpmdb/rpmdb.c:3372 msgid "failed to replace old database with new database!\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÍÅÎÉÔØ ÓÔÁÒÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÎÁ ÎÏ×ÕÀ!\n" -#: rpmdb/rpmdb.c:3359 +#: rpmdb/rpmdb.c:3374 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "ÆÁÊÌÙ × %s ÚÁÍÅÎÑÀÔÓÑ ÆÁÊÌÁÍÉ ÉÚ %s ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ" -#: rpmdb/rpmdb.c:3369 +#: rpmdb/rpmdb.c:3384 #, c-format msgid "removing directory %s\n" msgstr "ÕÄÁÌÑÅÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: rpmdb/rpmdb.c:3371 +#: rpmdb/rpmdb.c:3386 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n" diff --git a/po/sk.po b/po/sk.po index fd0ab50..1df3c89 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-19 19:37-0400\n" +"POT-Creation-Date: 2002-05-23 08:29-0400\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -2894,80 +2894,80 @@ msgstr "ch msgid "Unsatisifed dependencies for %s: " msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: " -#: rpmdb/db3.c:85 +#: rpmdb/db3.c:156 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db3.c:88 +#: rpmdb/db3.c:159 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db3.c:114 +#: rpmdb/db3.c:185 #, fuzzy, c-format msgid "closed db environment %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: rpmdb/db3.c:132 +#: rpmdb/db3.c:203 #, fuzzy, c-format msgid "removed db environment %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: rpmdb/db3.c:172 +#: rpmdb/db3.c:243 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: rpmdb/db3.c:605 +#: rpmdb/db3.c:678 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: rpmdb/db3.c:672 +#: rpmdb/db3.c:745 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: rpmdb/db3.c:894 +#: rpmdb/db3.c:967 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "otvára sa databáza s právami 0x%x v %s\n" -#: rpmdb/db3.c:1110 +#: rpmdb/db3.c:1183 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "nie je mo¾né získa» %s zámok pre databázu" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "exclusive" msgstr "výhradný" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "shared" msgstr "zdieµaný" -#: rpmdb/db3.c:1116 +#: rpmdb/db3.c:1189 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: rpmdb/dbconfig.c:390 +#: rpmdb/dbconfig.c:396 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:428 +#: rpmdb/dbconfig.c:434 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:437 +#: rpmdb/dbconfig.c:443 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:446 +#: rpmdb/dbconfig.c:452 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3068,17 +3068,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:164 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:236 +#: rpmdb/rpmdb.c:238 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "nie je mo¾né otvori» %s na %s:%d" -#: rpmdb/rpmdb.c:258 +#: rpmdb/rpmdb.c:260 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "nie je mo¾né otvori» %s\n" @@ -3088,8 +3088,8 @@ msgstr "nie je mo msgid "no dbpath has been set\n" msgstr "nebola nastavená ¾iadna dbpath" -#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034 -#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820 +#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2043 +#: rpmdb/rpmdb.c:2148 rpmdb/rpmdb.c:2835 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "chyba pri naèítaní záznamu %s z %s" @@ -3099,125 +3099,135 @@ msgstr "chyba pri na msgid "error(%d) storing record #%d into %s\n" msgstr "chyba pri zápise záznamu %s do %s" -#: rpmdb/rpmdb.c:1956 +#: rpmdb/rpmdb.c:1966 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2222 +#: rpmdb/rpmdb.c:2231 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "nie je mo¾né preèíta» hlavièku na %d pre vyhµadanie" -#: rpmdb/rpmdb.c:2388 +#: rpmdb/rpmdb.c:2292 +#, fuzzy, c-format +msgid "error(%d) setting header #%d record for %s removal\n" +msgstr "chyba pri naèítaní záznamu %s z %s" + +#: rpmdb/rpmdb.c:2403 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstraòuje sa index skupín\n" -#: rpmdb/rpmdb.c:2392 +#: rpmdb/rpmdb.c:2407 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstraòuje sa index názvov\n" -#: rpmdb/rpmdb.c:2440 +#: rpmdb/rpmdb.c:2434 +#, fuzzy, c-format +msgid "error(%d) setting \"%s\" records from %s index\n" +msgstr "chyba pri naèítaní záznamu %s z %s" + +#: rpmdb/rpmdb.c:2455 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "chyba pri zápise záznamu %s do %s" -#: rpmdb/rpmdb.c:2450 +#: rpmdb/rpmdb.c:2465 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "chyba pri odstraòovaní záznamu %s z %s" -#: rpmdb/rpmdb.c:2592 +#: rpmdb/rpmdb.c:2607 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "chyba pri hµadaní balíka %s\n" -#: rpmdb/rpmdb.c:2796 +#: rpmdb/rpmdb.c:2811 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "premenováva sa %s na %s\n" -#: rpmdb/rpmdb.c:2800 +#: rpmdb/rpmdb.c:2815 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "premenováva sa %s na %s\n" -#: rpmdb/rpmdb.c:2836 +#: rpmdb/rpmdb.c:2851 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "chyba pri zápise záznamu %s do %s" -#: rpmdb/rpmdb.c:3175 +#: rpmdb/rpmdb.c:3190 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3210 +#: rpmdb/rpmdb.c:3225 msgid "no dbpath has been set" msgstr "nebola nastavená ¾iadna dbpath" -#: rpmdb/rpmdb.c:3237 +#: rpmdb/rpmdb.c:3252 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "znovu sa vytvára databáza v adresári %s\n" -#: rpmdb/rpmdb.c:3241 +#: rpmdb/rpmdb.c:3256 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "doèasná databáza %s u¾ existuje" -#: rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:3262 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3249 +#: rpmdb/rpmdb.c:3264 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3271 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "otvára sa stará databáza\n" -#: rpmdb/rpmdb.c:3267 +#: rpmdb/rpmdb.c:3282 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "otvára sa nová databáza\n" -#: rpmdb/rpmdb.c:3291 +#: rpmdb/rpmdb.c:3306 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "záznam èíslo %d v databáze je chybný -- bol vynechaný" -#: rpmdb/rpmdb.c:3331 +#: rpmdb/rpmdb.c:3346 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "nie je mo¾né prida» záznam pôvodne na %d" -#: rpmdb/rpmdb.c:3349 +#: rpmdb/rpmdb.c:3364 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "nepodarilo sa znovu vytvori» databázu; zostáva pôvodná\n" -#: rpmdb/rpmdb.c:3357 +#: rpmdb/rpmdb.c:3372 msgid "failed to replace old database with new database!\n" msgstr "nepodarilo sa nahradi» starú databázu novou!\n" -#: rpmdb/rpmdb.c:3359 +#: rpmdb/rpmdb.c:3374 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "nahradí súbory v %s súbormi z %s kvôli obnove" -#: rpmdb/rpmdb.c:3369 +#: rpmdb/rpmdb.c:3384 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3371 +#: rpmdb/rpmdb.c:3386 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "nepodarilo sa odstráni» adresár %s: %s\n" diff --git a/po/sl.po b/po/sl.po index e8614fe..8739768 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.246 2002/05/19 23:37:33 jbj Exp $ +# $Id: sl.po,v 1.247 2002/05/23 19:42:42 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-19 19:37-0400\n" +"POT-Creation-Date: 2002-05-23 08:29-0400\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -2895,80 +2895,80 @@ msgstr "manjka %s\n" msgid "Unsatisifed dependencies for %s: " msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: " -#: rpmdb/db3.c:85 +#: rpmdb/db3.c:156 #, fuzzy, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "db%d napaka(%d)" -#: rpmdb/db3.c:88 +#: rpmdb/db3.c:159 #, fuzzy, c-format msgid "db%d error(%d): %s\n" msgstr "db%d napaka(%d)" -#: rpmdb/db3.c:114 +#: rpmdb/db3.c:185 #, fuzzy, c-format msgid "closed db environment %s/%s\n" msgstr "zaprto db okolje %s/%s\n" -#: rpmdb/db3.c:132 +#: rpmdb/db3.c:203 #, fuzzy, c-format msgid "removed db environment %s/%s\n" msgstr "odstranjeno db okolje %s/%s\n" -#: rpmdb/db3.c:172 +#: rpmdb/db3.c:243 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "odpiranje db okolja %s/%s %s\n" -#: rpmdb/db3.c:605 +#: rpmdb/db3.c:678 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "zaprto db kazalo %s/%s\n" -#: rpmdb/db3.c:672 +#: rpmdb/db3.c:745 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "zaprto db kazalo %s/%s\n" -#: rpmdb/db3.c:894 +#: rpmdb/db3.c:967 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "odpiranje db kazala %s/%s %s naèin=0x%x\n" -#: rpmdb/db3.c:1110 +#: rpmdb/db3.c:1183 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "ni mo¾no zakleniti z %s datotek %s/%s\n" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "exclusive" msgstr "izkljuèujoèe" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "shared" msgstr "skupno" -#: rpmdb/db3.c:1116 +#: rpmdb/db3.c:1189 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "zaklenjeno db kazalo %s/%s\n" -#: rpmdb/dbconfig.c:390 +#: rpmdb/dbconfig.c:396 #, fuzzy, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "dbiSetConfig: neprepoznana izbira db: \"%s\" prezrto\n" -#: rpmdb/dbconfig.c:428 +#: rpmdb/dbconfig.c:434 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s ima neveljavno ¹tevilèno vrednost, prezrto\n" -#: rpmdb/dbconfig.c:437 +#: rpmdb/dbconfig.c:443 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s ima preveliko ali premajhno dolgo (long) vrednost, prezrto\n" -#: rpmdb/dbconfig.c:446 +#: rpmdb/dbconfig.c:452 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3071,17 +3071,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:164 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: neprepoznano ime znaèke: \"%s\" prezrto\n" -#: rpmdb/rpmdb.c:236 +#: rpmdb/rpmdb.c:238 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "ni mo¾no odpreti kazala %s z uporabo db%d - %s (%d)" -#: rpmdb/rpmdb.c:258 +#: rpmdb/rpmdb.c:260 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "ni mo¾no odpreti kazala %s:" @@ -3091,8 +3091,8 @@ msgstr "ni mo msgid "no dbpath has been set\n" msgstr "dbpath ni nastavljena" -#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034 -#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820 +#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2043 +#: rpmdb/rpmdb.c:2148 rpmdb/rpmdb.c:2835 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s" @@ -3102,127 +3102,137 @@ msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s" msgid "error(%d) storing record #%d into %s\n" msgstr "napaka(%d) pri pisanju zapisa %s v %s" -#: rpmdb/rpmdb.c:1956 +#: rpmdb/rpmdb.c:1966 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2222 +#: rpmdb/rpmdb.c:2231 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: ni mo¾no prebrati glave pri 0x%x" -#: rpmdb/rpmdb.c:2388 +#: rpmdb/rpmdb.c:2292 +#, fuzzy, c-format +msgid "error(%d) setting header #%d record for %s removal\n" +msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s" + +#: rpmdb/rpmdb.c:2403 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstranjevanje \"%s\" iz kazala %s.\n" -#: rpmdb/rpmdb.c:2392 +#: rpmdb/rpmdb.c:2407 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstranjevanje %d vnosov iz kazala %s\n" -#: rpmdb/rpmdb.c:2440 +#: rpmdb/rpmdb.c:2434 +#, fuzzy, c-format +msgid "error(%d) setting \"%s\" records from %s index\n" +msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s" + +#: rpmdb/rpmdb.c:2455 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "napaka(%d) pri pisanju zapisa %s v %s" -#: rpmdb/rpmdb.c:2450 +#: rpmdb/rpmdb.c:2465 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "napaka(%d) pri brisanju zapisa %s iz %s" -#: rpmdb/rpmdb.c:2592 +#: rpmdb/rpmdb.c:2607 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "napaka(%d) pri iskanju paketa %s\n" -#: rpmdb/rpmdb.c:2796 +#: rpmdb/rpmdb.c:2811 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "dodajanje \"%s\" v kazalo %s.\n" -#: rpmdb/rpmdb.c:2800 +#: rpmdb/rpmdb.c:2815 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "dodajanje %d vnosov v kazalo %s.\n" -#: rpmdb/rpmdb.c:2836 +#: rpmdb/rpmdb.c:2851 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "napaka(%d) pri pisanju zapisa %s v %s" -#: rpmdb/rpmdb.c:3175 +#: rpmdb/rpmdb.c:3190 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3210 +#: rpmdb/rpmdb.c:3225 msgid "no dbpath has been set" msgstr "dbpath ni nastavljena" -#: rpmdb/rpmdb.c:3237 +#: rpmdb/rpmdb.c:3252 #, c-format msgid "rebuilding database %s into %s\n" msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n" -#: rpmdb/rpmdb.c:3241 +#: rpmdb/rpmdb.c:3256 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "zaèasna podatkovna zbirka %s ¾e obstaja" -#: rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:3262 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "ustvarjanje imenika: %s\n" -#: rpmdb/rpmdb.c:3249 +#: rpmdb/rpmdb.c:3264 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "ustvarjanje imenika: %s\n" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3271 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "odpiranje stare podatkovne zbirke\n" -#: rpmdb/rpmdb.c:3267 +#: rpmdb/rpmdb.c:3282 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "odpiramo nove podatkovne zbirke z dbapi %d\n" -#: rpmdb/rpmdb.c:3291 +#: rpmdb/rpmdb.c:3306 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "zapis ¹t. %d v zbirki je po¹kodovan -- preskoèeno." -#: rpmdb/rpmdb.c:3331 +#: rpmdb/rpmdb.c:3346 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "zapisa ni mo¾no dodati na %d" -#: rpmdb/rpmdb.c:3349 +#: rpmdb/rpmdb.c:3364 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "" "ponovna izgradnja podatkovne zbirke je bila neuspe¹na; stara ostaja na\n" "istem mestu\n" -#: rpmdb/rpmdb.c:3357 +#: rpmdb/rpmdb.c:3372 msgid "failed to replace old database with new database!\n" msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspe¹na!\n" -#: rpmdb/rpmdb.c:3359 +#: rpmdb/rpmdb.c:3374 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "poskus povrnitve z nadomestitvijo datotek v %s z datotekami v %s" -#: rpmdb/rpmdb.c:3369 +#: rpmdb/rpmdb.c:3384 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "odstranjevanje imenika: %s\n" -#: rpmdb/rpmdb.c:3371 +#: rpmdb/rpmdb.c:3386 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspe¹na odstranitev imenika %s: %s\n" diff --git a/po/sr.po b/po/sr.po index 51e7bd0..7778383 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-19 19:37-0400\n" +"POT-Creation-Date: 2002-05-23 08:29-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" @@ -2890,80 +2890,80 @@ msgstr "nedostaje { posle %" msgid "Unsatisifed dependencies for %s: " msgstr "Nezadovoljene meðuzavisnosti za %s-%s-%s: " -#: rpmdb/db3.c:85 +#: rpmdb/db3.c:156 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db3.c:88 +#: rpmdb/db3.c:159 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db3.c:114 +#: rpmdb/db3.c:185 #, c-format msgid "closed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:132 +#: rpmdb/db3.c:203 #, c-format msgid "removed db environment %s/%s\n" msgstr "" -#: rpmdb/db3.c:172 +#: rpmdb/db3.c:243 #, fuzzy, c-format msgid "opening db environment %s/%s %s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/db3.c:605 +#: rpmdb/db3.c:678 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/db3.c:672 +#: rpmdb/db3.c:745 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/db3.c:894 +#: rpmdb/db3.c:967 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/db3.c:1110 +#: rpmdb/db3.c:1183 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "exclusive" msgstr "ekskluzivno" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "shared" msgstr "deljeno" -#: rpmdb/db3.c:1116 +#: rpmdb/db3.c:1189 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/dbconfig.c:390 +#: rpmdb/dbconfig.c:396 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "" -#: rpmdb/dbconfig.c:428 +#: rpmdb/dbconfig.c:434 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:437 +#: rpmdb/dbconfig.c:443 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "" -#: rpmdb/dbconfig.c:446 +#: rpmdb/dbconfig.c:452 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "" @@ -3065,17 +3065,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:164 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:236 +#: rpmdb/rpmdb.c:238 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: rpmdb/rpmdb.c:258 +#: rpmdb/rpmdb.c:260 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" @@ -3085,8 +3085,8 @@ msgstr "gre msgid "no dbpath has been set\n" msgstr "dbpath nije odreðen" -#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034 -#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820 +#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2043 +#: rpmdb/rpmdb.c:2148 rpmdb/rpmdb.c:2835 #, fuzzy, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "gre¹ka kod uzimanja sloga %s iz %s" @@ -3096,124 +3096,134 @@ msgstr "gre msgid "error(%d) storing record #%d into %s\n" msgstr "gre¹ka zapisivanja sloga %s u %s" -#: rpmdb/rpmdb.c:1956 +#: rpmdb/rpmdb.c:1966 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2222 +#: rpmdb/rpmdb.c:2231 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "ne mogu da proèitam zaglavlje na %d za proveru" -#: rpmdb/rpmdb.c:2388 +#: rpmdb/rpmdb.c:2292 +#, fuzzy, c-format +msgid "error(%d) setting header #%d record for %s removal\n" +msgstr "gre¹ka kod uzimanja sloga %s iz %s" + +#: rpmdb/rpmdb.c:2403 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2392 +#: rpmdb/rpmdb.c:2407 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2440 +#: rpmdb/rpmdb.c:2434 +#, fuzzy, c-format +msgid "error(%d) setting \"%s\" records from %s index\n" +msgstr "gre¹ka kod uzimanja sloga %s iz %s" + +#: rpmdb/rpmdb.c:2455 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "gre¹ka zapisivanja sloga %s u %s" -#: rpmdb/rpmdb.c:2450 +#: rpmdb/rpmdb.c:2465 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2592 +#: rpmdb/rpmdb.c:2607 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "gre¹ka kod potrage za paketom %s\n" -#: rpmdb/rpmdb.c:2796 +#: rpmdb/rpmdb.c:2811 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2800 +#: rpmdb/rpmdb.c:2815 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2836 +#: rpmdb/rpmdb.c:2851 #, fuzzy, c-format msgid "error(%d) storing record %s into %s\n" msgstr "gre¹ka zapisivanja sloga %s u %s" -#: rpmdb/rpmdb.c:3175 +#: rpmdb/rpmdb.c:3190 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3210 +#: rpmdb/rpmdb.c:3225 msgid "no dbpath has been set" msgstr "dbpath nije odreðen" -#: rpmdb/rpmdb.c:3237 +#: rpmdb/rpmdb.c:3252 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3241 +#: rpmdb/rpmdb.c:3256 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "privremena baza podataka %s veæ postoji" -#: rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:3262 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3249 +#: rpmdb/rpmdb.c:3264 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3271 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3267 +#: rpmdb/rpmdb.c:3282 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3291 +#: rpmdb/rpmdb.c:3306 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "slog broj %d u bazi podataka je neispravan -- preskaèem ga" -#: rpmdb/rpmdb.c:3331 +#: rpmdb/rpmdb.c:3346 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "ne mogu da dodam slog originalno na %d" -#: rpmdb/rpmdb.c:3349 +#: rpmdb/rpmdb.c:3364 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3357 +#: rpmdb/rpmdb.c:3372 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3359 +#: rpmdb/rpmdb.c:3374 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3369 +#: rpmdb/rpmdb.c:3384 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3371 +#: rpmdb/rpmdb.c:3386 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspelo otvaranje %s: %s" diff --git a/po/sv.po b/po/sv.po index 8c839aa..4dca857 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-19 19:37-0400\n" +"POT-Creation-Date: 2002-05-23 08:29-0400\n" "PO-Revision-Date: 2001-09-12 14:18+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -2824,80 +2824,80 @@ msgstr "saknas %s" msgid "Unsatisifed dependencies for %s: " msgstr "Ouppfyllda beroenden för %s-%s-%s: " -#: rpmdb/db3.c:85 +#: rpmdb/db3.c:156 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "db%d-fel(%d) från %s: %s\n" -#: rpmdb/db3.c:88 +#: rpmdb/db3.c:159 #, c-format msgid "db%d error(%d): %s\n" msgstr "db%d-fel(%d): %s\n" -#: rpmdb/db3.c:114 +#: rpmdb/db3.c:185 #, c-format msgid "closed db environment %s/%s\n" msgstr "stängde db-miljö %s/%s\n" -#: rpmdb/db3.c:132 +#: rpmdb/db3.c:203 #, c-format msgid "removed db environment %s/%s\n" msgstr "tog bort db-miljö %s/%s\n" -#: rpmdb/db3.c:172 +#: rpmdb/db3.c:243 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "öppnar db-miljö %s/%s %s\n" -#: rpmdb/db3.c:605 +#: rpmdb/db3.c:678 #, c-format msgid "closed db index %s/%s\n" msgstr "stängde db-index %s/%s\n" -#: rpmdb/db3.c:672 +#: rpmdb/db3.c:745 #, c-format msgid "verified db index %s/%s\n" msgstr "verifierade db-index %s/%s\n" -#: rpmdb/db3.c:894 +#: rpmdb/db3.c:967 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "öppnar db-index %s/%s %s rättighet=0x%x\n" -#: rpmdb/db3.c:1110 +#: rpmdb/db3.c:1183 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "kan inte få %s lås på %s/%s\n" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "exclusive" msgstr "uteslutande" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "shared" msgstr "delat" -#: rpmdb/db3.c:1116 +#: rpmdb/db3.c:1189 #, c-format msgid "locked db index %s/%s\n" msgstr "låste db-index %s/%s\n" -#: rpmdb/dbconfig.c:390 +#: rpmdb/dbconfig.c:396 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "okänd db-flagga: \"%s\" ignorerad\n" -#: rpmdb/dbconfig.c:428 +#: rpmdb/dbconfig.c:434 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s har ogiltigt ogiltigt numeriskt värde, hoppar över\n" -#: rpmdb/dbconfig.c:437 +#: rpmdb/dbconfig.c:443 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s har för stort eller för litet \"long\"-värde, hoppar över\n" -#: rpmdb/dbconfig.c:446 +#: rpmdb/dbconfig.c:452 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "%s har för stort eller för litet heltalsvärde, hoppar över\n" @@ -2995,17 +2995,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "generera huvuden kompatibla med (äldre) rpm[23]-paketering" #. @-modfilesys@ -#: rpmdb/rpmdb.c:164 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: okänt taggnamn: \"%s\" ignorerat\n" -#: rpmdb/rpmdb.c:236 +#: rpmdb/rpmdb.c:238 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "kan inte öppna %s-indexet med db%d - %s (%d)\n" -#: rpmdb/rpmdb.c:258 +#: rpmdb/rpmdb.c:260 #, c-format msgid "cannot open %s index\n" msgstr "kan inte öppna %s-indexet\n" @@ -3014,8 +3014,8 @@ msgstr "kan inte msgid "no dbpath has been set\n" msgstr "ingen dbpath har satts\n" -#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034 -#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820 +#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2043 +#: rpmdb/rpmdb.c:2148 rpmdb/rpmdb.c:2835 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "fel(%d) när \"%s\"-poster hämtades från %s-indexet\n" @@ -3025,124 +3025,134 @@ msgstr "fel(%d) n msgid "error(%d) storing record #%d into %s\n" msgstr "fel(%d) när post %s sparades i %s\n" -#: rpmdb/rpmdb.c:1956 +#: rpmdb/rpmdb.c:1966 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "rpmdb: skadad huvudinstans #%u hämtad, hoppar över.\n" -#: rpmdb/rpmdb.c:2222 +#: rpmdb/rpmdb.c:2231 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: kan inte läsa huvud vid 0x%x\n" -#: rpmdb/rpmdb.c:2388 +#: rpmdb/rpmdb.c:2292 +#, fuzzy, c-format +msgid "error(%d) setting header #%d record for %s removal\n" +msgstr "fel(%d) när \"%s\"-poster hämtades från %s-indexet\n" + +#: rpmdb/rpmdb.c:2403 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "tar bort \"%s\" från %s-indexet.\n" -#: rpmdb/rpmdb.c:2392 +#: rpmdb/rpmdb.c:2407 #, c-format msgid "removing %d entries from %s index.\n" msgstr "tar bort %d poster från %s-indexet.\n" -#: rpmdb/rpmdb.c:2440 +#: rpmdb/rpmdb.c:2434 +#, fuzzy, c-format +msgid "error(%d) setting \"%s\" records from %s index\n" +msgstr "fel(%d) när \"%s\"-poster hämtades från %s-indexet\n" + +#: rpmdb/rpmdb.c:2455 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "fel(%d) när post %s sparades i %s\n" -#: rpmdb/rpmdb.c:2450 +#: rpmdb/rpmdb.c:2465 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "fel(%d) när post %s togs bort ur %s\n" -#: rpmdb/rpmdb.c:2592 +#: rpmdb/rpmdb.c:2607 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "fel(%d) vid allokering av ny paketinstans\n" -#: rpmdb/rpmdb.c:2796 +#: rpmdb/rpmdb.c:2811 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "lägger till \"%s\" till %s-indexet.\n" -#: rpmdb/rpmdb.c:2800 +#: rpmdb/rpmdb.c:2815 #, c-format msgid "adding %d entries to %s index.\n" msgstr "lägger till %d poster till %s-indexet.\n" -#: rpmdb/rpmdb.c:2836 +#: rpmdb/rpmdb.c:2851 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "fel(%d) när post %s sparades i %s\n" -#: rpmdb/rpmdb.c:3175 +#: rpmdb/rpmdb.c:3190 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "tar bort %s efter lyckad db3-ombyggnad.\n" -#: rpmdb/rpmdb.c:3210 +#: rpmdb/rpmdb.c:3225 msgid "no dbpath has been set" msgstr "ingen dbpath har satts" -#: rpmdb/rpmdb.c:3237 +#: rpmdb/rpmdb.c:3252 #, c-format msgid "rebuilding database %s into %s\n" msgstr "bygger om databas %s till %s\n" -#: rpmdb/rpmdb.c:3241 +#: rpmdb/rpmdb.c:3256 #, c-format msgid "temporary database %s already exists\n" msgstr "tillfällig databas %s existerar redan\n" -#: rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:3262 #, c-format msgid "creating directory %s\n" msgstr "skapar katalog %s\n" -#: rpmdb/rpmdb.c:3249 +#: rpmdb/rpmdb.c:3264 #, c-format msgid "creating directory %s: %s\n" msgstr "skapar katalog %s: %s\n" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "opening old database with dbapi %d\n" msgstr "öppnar gammal databas med dbapi %d\n" -#: rpmdb/rpmdb.c:3267 +#: rpmdb/rpmdb.c:3282 #, c-format msgid "opening new database with dbapi %d\n" msgstr "öppnar ny databas med dbapi %d\n" -#: rpmdb/rpmdb.c:3291 +#: rpmdb/rpmdb.c:3306 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "post nummer %u i databasen är felaktig -- hoppar över.\n" -#: rpmdb/rpmdb.c:3331 +#: rpmdb/rpmdb.c:3346 #, c-format msgid "cannot add record originally at %u\n" msgstr "kan inte lägga till post ursprungligen vid %u\n" -#: rpmdb/rpmdb.c:3349 +#: rpmdb/rpmdb.c:3364 msgid "failed to rebuild database: original database remains in place\n" msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n" -#: rpmdb/rpmdb.c:3357 +#: rpmdb/rpmdb.c:3372 msgid "failed to replace old database with new database!\n" msgstr "kunde inte ersätta gammal databas med ny databas!\n" -#: rpmdb/rpmdb.c:3359 +#: rpmdb/rpmdb.c:3374 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "byt ut filer i %s med filer från %s för att återställa" -#: rpmdb/rpmdb.c:3369 +#: rpmdb/rpmdb.c:3384 #, c-format msgid "removing directory %s\n" msgstr "tar bort katalog %s\n" -#: rpmdb/rpmdb.c:3371 +#: rpmdb/rpmdb.c:3386 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunde inte ta bort katalogen %s: %s\n" diff --git a/po/tr.po b/po/tr.po index e330812..0933f72 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-19 19:37-0400\n" +"POT-Creation-Date: 2002-05-23 08:29-0400\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -2845,80 +2845,80 @@ msgstr "eksik %s" msgid "Unsatisifed dependencies for %s: " msgstr "%s-%s-%s için tatmin edici olmayan baðýmlýlýklar: " -#: rpmdb/db3.c:85 +#: rpmdb/db3.c:156 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "db%d hata(%d) %s'den: %s\n" -#: rpmdb/db3.c:88 +#: rpmdb/db3.c:159 #, c-format msgid "db%d error(%d): %s\n" msgstr "db%d hata(%d): %s\n" -#: rpmdb/db3.c:114 +#: rpmdb/db3.c:185 #, c-format msgid "closed db environment %s/%s\n" msgstr "kapandý db ortamý %s/%s\n" -#: rpmdb/db3.c:132 +#: rpmdb/db3.c:203 #, c-format msgid "removed db environment %s/%s\n" msgstr "silindi db ortamý %s/%s\n" -#: rpmdb/db3.c:172 +#: rpmdb/db3.c:243 #, c-format msgid "opening db environment %s/%s %s\n" msgstr "açýlýyor db ortamý %s/%s %s\n" -#: rpmdb/db3.c:605 +#: rpmdb/db3.c:678 #, c-format msgid "closed db index %s/%s\n" msgstr "kapandý db endeks %s/%s\n" -#: rpmdb/db3.c:672 +#: rpmdb/db3.c:745 #, c-format msgid "verified db index %s/%s\n" msgstr "doðrulandý db endeks %s/%s\n" -#: rpmdb/db3.c:894 +#: rpmdb/db3.c:967 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "açýlýyor db endeks %s/%s %s kip=0x%x\n" -#: rpmdb/db3.c:1110 +#: rpmdb/db3.c:1183 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "%s kilit %s/%s'den alýnamadý\n" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "exclusive" msgstr "baðdaþýk" -#: rpmdb/db3.c:1112 +#: rpmdb/db3.c:1185 msgid "shared" msgstr "paylaþýmlý" -#: rpmdb/db3.c:1116 +#: rpmdb/db3.c:1189 #, c-format msgid "locked db index %s/%s\n" msgstr "kilitli db endeks %s/%s\n" -#: rpmdb/dbconfig.c:390 +#: rpmdb/dbconfig.c:396 #, c-format msgid "unrecognized db option: \"%s\" ignored.\n" msgstr "tanýnmayan db seçeneði: \"%s\" yoksayýldý\n" -#: rpmdb/dbconfig.c:428 +#: rpmdb/dbconfig.c:434 #, c-format msgid "%s has invalid numeric value, skipped\n" msgstr "%s geçersiz sayýsal deðer içeriyor, atlandý\n" -#: rpmdb/dbconfig.c:437 +#: rpmdb/dbconfig.c:443 #, c-format msgid "%s has too large or too small long value, skipped\n" msgstr "%s ya çok büyük ya da çok küçük 'long' deðer içeriyor, atlandý\n" -#: rpmdb/dbconfig.c:446 +#: rpmdb/dbconfig.c:452 #, c-format msgid "%s has too large or too small integer value, skipped\n" msgstr "%s ya çok büyük ya da çok küçük 'integer' deðer içeriyor, atlandý\n" @@ -3016,17 +3016,17 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "(eski) rpm[23] paketleme ile uyumlu baþlýklarý üretir" #. @-modfilesys@ -#: rpmdb/rpmdb.c:164 +#: rpmdb/rpmdb.c:166 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: tanýmlanmamýþ etiket adý: \"%s\" yoksayýldý\n" -#: rpmdb/rpmdb.c:236 +#: rpmdb/rpmdb.c:238 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "%s indeksi db%d - %s (%d) kullanarak açýlamadý\n" -#: rpmdb/rpmdb.c:258 +#: rpmdb/rpmdb.c:260 #, c-format msgid "cannot open %s index\n" msgstr "%s indeksi açýlamadý\n" @@ -3035,8 +3035,8 @@ msgstr "%s indeksi a msgid "no dbpath has been set\n" msgstr "belirtilmiþ bir dbpath deðeri yok\n" -#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2034 -#: rpmdb/rpmdb.c:2139 rpmdb/rpmdb.c:2419 rpmdb/rpmdb.c:2820 +#: rpmdb/rpmdb.c:991 rpmdb/rpmdb.c:1120 rpmdb/rpmdb.c:1169 rpmdb/rpmdb.c:2043 +#: rpmdb/rpmdb.c:2148 rpmdb/rpmdb.c:2835 #, c-format msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n" @@ -3046,126 +3046,136 @@ msgstr "hata(%d): \"%s\" kay msgid "error(%d) storing record #%d into %s\n" msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n" -#: rpmdb/rpmdb.c:1956 +#: rpmdb/rpmdb.c:1966 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "rpmdb: bozuk baþlýk örneði #%u alýndý, atlanýyor.\n" -#: rpmdb/rpmdb.c:2222 +#: rpmdb/rpmdb.c:2231 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: 0x%x de baþlýk okunamadý\n" -#: rpmdb/rpmdb.c:2388 +#: rpmdb/rpmdb.c:2292 +#, fuzzy, c-format +msgid "error(%d) setting header #%d record for %s removal\n" +msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n" + +#: rpmdb/rpmdb.c:2403 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "\"%s\" %s indeksinden siliniyor.\n" -#: rpmdb/rpmdb.c:2392 +#: rpmdb/rpmdb.c:2407 #, c-format msgid "removing %d entries from %s index.\n" msgstr "%d girdi %s indeksinden siliniyor.\n" -#: rpmdb/rpmdb.c:2440 +#: rpmdb/rpmdb.c:2434 +#, fuzzy, c-format +msgid "error(%d) setting \"%s\" records from %s index\n" +msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n" + +#: rpmdb/rpmdb.c:2455 #, fuzzy, c-format msgid "error(%d) storing record \"%s\" into %s\n" msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n" -#: rpmdb/rpmdb.c:2450 +#: rpmdb/rpmdb.c:2465 #, fuzzy, c-format msgid "error(%d) removing record \"%s\" from %s\n" msgstr "hata(%d) %s kaydýn %s dosyasýndan silinmesi\n" -#: rpmdb/rpmdb.c:2592 +#: rpmdb/rpmdb.c:2607 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "yeni paket örneðini tutma hatasý(%d)\n" -#: rpmdb/rpmdb.c:2796 +#: rpmdb/rpmdb.c:2811 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "\"%s\" %s indeksine ekleniyor.\n" -#: rpmdb/rpmdb.c:2800 +#: rpmdb/rpmdb.c:2815 #, c-format msgid "adding %d entries to %s index.\n" msgstr "%d girdi %s indeksine ekleniyor.\n" -#: rpmdb/rpmdb.c:2836 +#: rpmdb/rpmdb.c:2851 #, c-format msgid "error(%d) storing record %s into %s\n" msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n" -#: rpmdb/rpmdb.c:3175 +#: rpmdb/rpmdb.c:3190 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "baþarýlý db3 yeniden oluþturma ertesinde %s kaldýrýlýyor\n" -#: rpmdb/rpmdb.c:3210 +#: rpmdb/rpmdb.c:3225 msgid "no dbpath has been set" msgstr "belirtilmiþ bir dbpath yok" -#: rpmdb/rpmdb.c:3237 +#: rpmdb/rpmdb.c:3252 #, c-format msgid "rebuilding database %s into %s\n" msgstr "%s veritabaný %s içinde yeniden oluþturuluyor\n" -#: rpmdb/rpmdb.c:3241 +#: rpmdb/rpmdb.c:3256 #, c-format msgid "temporary database %s already exists\n" msgstr "geçici veritabaný %s zaten mevcut\n" -#: rpmdb/rpmdb.c:3247 +#: rpmdb/rpmdb.c:3262 #, c-format msgid "creating directory %s\n" msgstr "%s dizini oluþturuluyor\n" -#: rpmdb/rpmdb.c:3249 +#: rpmdb/rpmdb.c:3264 #, c-format msgid "creating directory %s: %s\n" msgstr "%s dizini oluþturuluyor: %s\n" -#: rpmdb/rpmdb.c:3256 +#: rpmdb/rpmdb.c:3271 #, c-format msgid "opening old database with dbapi %d\n" msgstr "eski veritabaný dbapi %d ile açýlýyor\n" -#: rpmdb/rpmdb.c:3267 +#: rpmdb/rpmdb.c:3282 #, c-format msgid "opening new database with dbapi %d\n" msgstr "yeni veritabaný dbapi %d ile açýlýyor\n" -#: rpmdb/rpmdb.c:3291 +#: rpmdb/rpmdb.c:3306 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "veritabanýndaki %u. kayýt hatalý -- atlanýyor\n" -#: rpmdb/rpmdb.c:3331 +#: rpmdb/rpmdb.c:3346 #, c-format msgid "cannot add record originally at %u\n" msgstr "kayýt özgün olarak %u e eklenemedi\n" -#: rpmdb/rpmdb.c:3349 +#: rpmdb/rpmdb.c:3364 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "veritabaný yeniden oluþturulamadý: mevcut veritabaný deðiþmeden\n" "yerinde býrakýldý\n" -#: rpmdb/rpmdb.c:3357 +#: rpmdb/rpmdb.c:3372 msgid "failed to replace old database with new database!\n" msgstr "eski veritabanýnýn yenisiyle deðiþtirilirmesi baþarýsýz!\n" -#: rpmdb/rpmdb.c:3359 +#: rpmdb/rpmdb.c:3374 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "kurtarmak için %s içindeki dosyalar %s deki dosyalarla deðiþtiriliyor" -#: rpmdb/rpmdb.c:3369 +#: rpmdb/rpmdb.c:3384 #, c-format msgid "removing directory %s\n" msgstr "%s dizini siliniyor\n" -#: rpmdb/rpmdb.c:3371 +#: rpmdb/rpmdb.c:3386 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s dizininin silinmesi baþarýsýz: %s\n" diff --git a/python/Makefile.am b/python/Makefile.am index 57882df..ae52c4e 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -34,7 +34,7 @@ poptmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,poptmodule.so noinst_LTLIBRARIES = librpmmodule.la librpmmodule_la_SOURCES = rpmmodule.c hash.c upgrade.c \ - db-py.c header-py.c rpmds-py.c rpmfi-py.c + db-py.c header-py.c rpmds-py.c rpmfi-py.c rpmts-py.c rpmmodule.so$(EXEEXT): $(librpmmodule_la_OBJECTS) $(LINK) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS) diff --git a/python/Makefile.in b/python/Makefile.in index 4847f47..446fb3c 100644 --- a/python/Makefile.in +++ b/python/Makefile.in @@ -230,7 +230,7 @@ poptmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,poptmodule.so noinst_LTLIBRARIES = librpmmodule.la librpmmodule_la_SOURCES = rpmmodule.c hash.c upgrade.c \ - db-py.c header-py.c rpmds-py.c rpmfi-py.c + db-py.c header-py.c rpmds-py.c rpmfi-py.c rpmts-py.c subdir = python mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -241,7 +241,7 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) librpmmodule_la_LDFLAGS = librpmmodule_la_LIBADD = am_librpmmodule_la_OBJECTS = rpmmodule.lo hash.lo upgrade.lo db-py.lo \ - header-py.lo rpmds-py.lo rpmfi-py.lo + header-py.lo rpmds-py.lo rpmfi-py.lo rpmts-py.lo librpmmodule_la_OBJECTS = $(am_librpmmodule_la_OBJECTS) python_PROGRAMS = rpmmodule.so$(EXEEXT) poptmodule.so$(EXEEXT) PROGRAMS = $(python_PROGRAMS) @@ -265,7 +265,8 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/db-py.Plo ./$(DEPDIR)/hash.Plo \ @AMDEP_TRUE@ ./$(DEPDIR)/header-py.Plo ./$(DEPDIR)/poptmodule.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/rpmds-py.Plo ./$(DEPDIR)/rpmfi-py.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/rpmmodule.Plo ./$(DEPDIR)/upgrade.Plo +@AMDEP_TRUE@ ./$(DEPDIR)/rpmmodule.Plo ./$(DEPDIR)/rpmts-py.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/upgrade.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ @@ -334,6 +335,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpmds-py.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpmfi-py.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpmmodule.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpmts-py.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upgrade.Plo@am__quote@ distclean-depend: diff --git a/python/header-py.c b/python/header-py.c index a310854..f797e30 100644 --- a/python/header-py.c +++ b/python/header-py.c @@ -542,6 +542,7 @@ static struct PyMethodDef hdrMethods[] = { {"rhnUnload", (PyCFunction) rhnUnload, METH_VARARGS }, {"sprintf", (PyCFunction) hdrSprintf, METH_VARARGS }, + {"dsOfHeader", (PyCFunction)hdr_dsOfHeader, METH_VARARGS, NULL}, {"dsFromHeader", (PyCFunction)hdr_dsFromHeader, METH_VARARGS, NULL}, {"fiFromHeader", (PyCFunction)hdr_fiFromHeader, METH_VARARGS, NULL}, diff --git a/python/rpmds-py.c b/python/rpmds-py.c index d6fee2d..c695b1d 100644 --- a/python/rpmds-py.c +++ b/python/rpmds-py.c @@ -72,6 +72,12 @@ rpmds_TagN(rpmdsObject * s, PyObject * args) return Py_BuildValue("i", rpmdsTagN(s->ds)); } +static int +rpmds_Compare(rpmdsObject * a, rpmdsObject * b) +{ + return rpmdsCompare(a->ds, b->ds); +} + #if Py_TPFLAGS_HAVE_ITER static PyObject * rpmds_Next(rpmdsObject * s) @@ -119,15 +125,6 @@ rpmds_Notify(rpmdsObject * s, PyObject * args) } static PyObject * -rpmds_Compare(rpmdsObject * s, PyObject * args) -{ - if (!PyArg_ParseTuple(args, "")) - return NULL; - Py_INCREF(Py_None); - return Py_None; -} - -static PyObject * rpmds_Problem(rpmdsObject * s, PyObject * args) { if (!PyArg_ParseTuple(args, "")) @@ -152,7 +149,6 @@ static struct PyMethodDef rpmds_methods[] = { #endif #ifdef NOTYET {"Notify", (PyCFunction)rpmds_Notify, METH_VARARGS, NULL}, - {"Compare", (PyCFunction)rpmds_Compare, METH_VARARGS, NULL}, {"Problem", (PyCFunction)rpmds_Problem, METH_VARARGS, NULL}, #endif {NULL, NULL} /* sentinel */ @@ -225,7 +221,7 @@ PyTypeObject rpmds_Type = { (printfunc)rpmds_print, /* tp_print */ (getattrfunc)rpmds_getattr, /* tp_getattr */ (setattrfunc)0, /* tp_setattr */ - (cmpfunc)0, /* tp_compare */ + (cmpfunc)rpmds_Compare, /* tp_compare */ (reprfunc)0, /* tp_repr */ 0, /* tp_as_number */ 0, /* tp_as_sequence */ @@ -279,11 +275,38 @@ rpmds_New(rpmds ds) } rpmdsObject * +rpmds_Single(PyObject * s, PyObject * args) +{ + int tagN = RPMTAG_PROVIDENAME; + const char * N; + const char * EVR = NULL; + int Flags = 0; + + if (!PyArg_ParseTuple(args, "is|si", &tagN, &N, &EVR, &Flags)) + return NULL; + return rpmds_New( rpmdsSingle(tagN, N, EVR, Flags) ); +} + +rpmdsObject * hdr_dsFromHeader(PyObject * s, PyObject * args) { hdrObject * ho; + int tagN = RPMTAG_REQUIRENAME; + int scareMem = 0; + + if (!PyArg_ParseTuple(args, "O!|i", &hdr_Type, &ho, &tagN)) + return NULL; + return rpmds_New( rpmdsNew(hdrGetHeader(ho), tagN, scareMem) ); +} + +rpmdsObject * +hdr_dsOfHeader(PyObject * s, PyObject * args) +{ + hdrObject * ho; + int tagN = RPMTAG_PROVIDENAME; + int Flags = RPMSENSE_EQUAL; if (!PyArg_ParseTuple(args, "O!", &hdr_Type, &ho)) return NULL; - return rpmds_New( rpmdsNew(hdrGetHeader(ho), RPMTAG_REQUIRENAME, 0) ); + return rpmds_New( rpmdsThis(hdrGetHeader(ho), tagN, Flags) ); } diff --git a/python/rpmds-py.h b/python/rpmds-py.h index 5cd2749..e730090 100644 --- a/python/rpmds-py.h +++ b/python/rpmds-py.h @@ -16,6 +16,10 @@ rpmds dsFromDs(rpmdsObject * ds); rpmdsObject * rpmds_New(rpmds ds); +rpmdsObject * rpmds_Single(PyObject * s, PyObject * args); + rpmdsObject * hdr_dsFromHeader(PyObject * s, PyObject * args); +rpmdsObject * hdr_dsOfHeader(PyObject * s, PyObject * args); + #endif diff --git a/python/rpmmodule.c b/python/rpmmodule.c index ea2a8a4..a80c267 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -35,17 +35,12 @@ #include "header-py.h" #include "rpmds-py.h" #include "rpmfi-py.h" +#include "rpmts-py.h" #include "debug.h" extern int _rpmio_debug; -/* XXX These names/constants have been removed from the rpmlib API. */ -enum { - RPMDEP_SENSE_REQUIRES, /*!< requirement not satisfied. */ - RPMDEP_SENSE_CONFLICTS /*!< conflict was found. */ -}; - #ifdef __LCLINT__ #undef PyObject_HEAD #define PyObject_HEAD int _PyObjectHead @@ -55,562 +50,12 @@ enum { int rpmvercmp(const char * one, const char * two); /** \ingroup python - */ -typedef struct rpmtsObject_s rpmtsObject; - -/** \ingroup python - * \name Class: rpmtrans - * \class rpmtrans - * \brief A python rpmtrans object represents an RPM transaction set. - * - * The transaction set is the workhorse of RPM. It performs the - * installation and upgrade of packages. The rpmtrans object is - * instantiated by the TransactionSet function in the rpm module. - * - * The TransactionSet function takes two optional arguments. The first - * argument is the root path, the second is an open database to perform - * the transaction set upon. - * - * A rpmtrans object has the following methods: - * - * - add(header,data,mode) Add a binary package to a transaction set. - * @param header the header to be added - * @param data user data that will be passed to the transaction callback - * during transaction execution - * @param mode optional argument that specifies if this package should - * be installed ('i'), upgraded ('u'), or if it is just - * available to the transaction when computing - * dependencies but no action should be performed with it - * ('a'). - * - * - remove - * - * - depcheck() Perform a dependency and conflict check on the - * transaction set. After headers have been added to a - * transaction set, a dependency check can be performed - * to make sure that all package dependencies are - * satisfied. - * @return None If there are no unresolved dependencies - * Otherwise a list of complex tuples is returned, one tuple per - * unresolved dependency, with - * The format of the dependency tuple is: - * ((packageName, packageVersion, packageRelease), - * (reqName, reqVersion), - * needsFlags, - * suggestedPackage, - * sense) - * packageName, packageVersion, packageRelease are the name, - * version, and release of the package that has the unresolved - * dependency or conflict. - * The reqName and reqVersion are the name and version of the - * requirement or conflict. - * The needsFlags is a bitfield that describes the versioned - * nature of a requirement or conflict. The constants - * rpm.RPMSENSE_LESS, rpm.RPMSENSE_GREATER, and - * rpm.RPMSENSE_EQUAL can be logical ANDed with the needsFlags - * to get versioned dependency information. - * suggestedPackage is a tuple if the dependency check was aware - * of a package that solves this dependency problem when the - * dependency check was run. Packages that are added to the - * transaction set as "available" are examined during the - * dependency check as possible dependency solvers. The tuple - * contains two values, (header, suggestedName). These are set to - * the header of the suggested package and its name, respectively. - * If there is no known package to solve the dependency problem, - * suggestedPackage is None. - * The constants rpm.RPMDEP_SENSE_CONFLICTS and - * rpm.RPMDEP_SENSE_REQUIRES are set to show a dependency as a - * requirement or a conflict. - * - * - run(flags,problemSetFilter,callback,data) Attempt to execute a - * transaction set. After the transaction set has been populated - * with install and upgrade actions, it can be executed by invoking - * the run() method. - * @param flags - modifies the behavior of the transaction set as it is - * processed. The following values can be locical ORed - * together: - * - rpm.RPMTRANS_FLAG_TEST - test mode, do not modify the RPM - * database, change any files, or run any package scripts - * - rpm.RPMTRANS_FLAG_BUILD_PROBS - only build a list of - * problems encountered when attempting to run this transaction - * set - * - rpm.RPMTRANS_FLAG_NOSCRIPTS - do not execute package scripts - * - rpm.RPMTRANS_FLAG_JUSTDB - only make changes to the rpm - * database, do not modify files. - * - rpm.RPMTRANS_FLAG_NOTRIGGERS - do not run trigger scripts - * - rpm.RPMTRANS_FLAG_NODOCS - do not install files marked as %doc - * - rpm.RPMTRANS_FLAG_ALLFILES - create all files, even if a - * file is marked %config(missingok) and an upgrade is - * being performed. - * - rpm.RPMTRANS_FLAG_KEEPOBSOLETE - do not remove obsoleted - * packages. - * @param problemSetFilter - control bit(s) to ignore classes of problems, - * any of - * - rpm.RPMPROB_FILTER_IGNOREOS - - * - rpm.RPMPROB_FILTER_IGNOREARCH - - * - rpm.RPMPROB_FILTER_REPLACEPKG - - * - rpm.RPMPROB_FILTER_FORCERELOCATE - - * - rpm.RPMPROB_FILTER_REPLACENEWFILES - - * - rpm.RPMPROB_FILTER_REPLACEOLDFILES - - * - rpm.RPMPROB_FILTER_OLDPACKAGE - - * - rpm.RPMPROB_FILTER_DISKSPACE - - */ - -/** \ingroup python - * \name Class: rpmtrans - */ -/*@{*/ - -/** \ingroup python - */ -struct rpmtsObject_s { - PyObject_HEAD; - rpmdbObject * dbo; - rpmts ts; - PyObject * keyList; /* keeps reference counts correct */ - FD_t scriptFd; -} ; - -/** \ingroup python - */ -static PyObject * rpmts_Add(rpmtsObject * s, PyObject * args) { - hdrObject * h; - PyObject * key; - char * how = NULL; - int isUpgrade = 0; - PyObject * hObj; - - if (!PyArg_ParseTuple(args, "OO|s", &h, &key, &how)) return NULL; - - hObj = (PyObject *) h; - if (hObj->ob_type != &hdr_Type) { - PyErr_SetString(PyExc_TypeError, "bad type for header argument"); - return NULL; - } - - if (how && strcmp(how, "a") && strcmp(how, "u") && strcmp(how, "i")) { - PyErr_SetString(PyExc_TypeError, "how argument must be \"u\", \"a\", or \"i\""); - return NULL; - } else if (how && !strcmp(how, "u")) - isUpgrade = 1; - - if (how && !strcmp(how, "a")) - rpmtsAvailablePackage(s->ts, hdrGetHeader(h), key); - else - rpmtsAddPackage(s->ts, hdrGetHeader(h), key, isUpgrade, NULL); - - /* This should increment the usage count for me */ - if (key) { - PyList_Append(s->keyList, key); - } - - Py_INCREF(Py_None); - return Py_None; -} - -/** \ingroup python - */ -static PyObject * rpmts_Remove(rpmtsObject * s, PyObject * args) { - char * name; - int count; - rpmdbMatchIterator mi; - - if (!PyArg_ParseTuple(args, "s", &name)) - return NULL; - - /* XXX: Copied hack from ../lib/rpminstall.c, rpmErase() */ - mi = rpmdbInitIterator(dbFromDb(s->dbo), RPMDBI_LABEL, name, 0); - count = rpmdbGetIteratorCount(mi); - if (count <= 0) { - PyErr_SetString(pyrpmError, "package not installed"); - return NULL; - } else { /* XXX: Note that we automatically choose to remove all matches */ - Header h; - while ((h = rpmdbNextIterator(mi)) != NULL) { - unsigned int recOffset = rpmdbGetIteratorOffset(mi); - if (recOffset) { - rpmtsRemovePackage(s->ts, h, recOffset); - } - } - } - rpmdbFreeIterator(mi); - - Py_INCREF(Py_None); - return Py_None; -} - -/** \ingroup python - */ -static PyObject * rpmts_Check(rpmtsObject * s, PyObject * args) { - rpmps ps; - rpmProblem p; - PyObject * list, * cf; - int i; - int allSuggestions = 0; - int xx; - - if (!PyArg_ParseTuple(args, "|i", &allSuggestions)) return NULL; - - xx = rpmtsCheck(s->ts); - ps = rpmtsGetProblems(s->ts); - if (ps) { - list = PyList_New(0); - - /* XXX TODO: rpmlib >= 4.0.3 can return multiple suggested keys. */ - for (i = 0; i < ps->numProblems; i++) { -#ifdef DYING - cf = Py_BuildValue("((sss)(ss)iOi)", conflicts[i].byName, - conflicts[i].byVersion, conflicts[i].byRelease, - - conflicts[i].needsName, - conflicts[i].needsVersion, - - conflicts[i].needsFlags, - conflicts[i].suggestedPkgs ? - conflicts[i].suggestedPkgs[0] : Py_None, - conflicts[i].sense); -#else - char * byName, * byVersion, * byRelease; - char * needsName, * needsOP, * needsVersion; - int needsFlags, sense; - fnpyKey key; - - p = ps->probs + i; - - byName = p->pkgNEVR; - if ((byRelease = strrchr(byName, '-')) != NULL) - *byRelease++ = '\0'; - if ((byVersion = strrchr(byName, '-')) != NULL) - *byVersion++ = '\0'; - - key = p->key; - - needsName = p->altNEVR; - if (needsName[1] == ' ') { - sense = (needsName[0] == 'C') - ? RPMDEP_SENSE_CONFLICTS : RPMDEP_SENSE_REQUIRES; - needsName += 2; - } else - sense = RPMDEP_SENSE_REQUIRES; - if ((needsVersion = strrchr(needsName, ' ')) != NULL) - *needsVersion++ = '\0'; - - needsFlags = 0; - if ((needsOP = strrchr(needsName, ' ')) != NULL) { - for (*needsOP++ = '\0'; *needsOP != '\0'; needsOP++) { - if (*needsOP == '<') needsFlags |= RPMSENSE_LESS; - else if (*needsOP == '>') needsFlags |= RPMSENSE_GREATER; - else if (*needsOP == '=') needsFlags |= RPMSENSE_EQUAL; - } - } - - cf = Py_BuildValue("((sss)(ss)iOi)", byName, byVersion, byRelease, - needsName, needsVersion, needsFlags, - (key != NULL ? key : Py_None), - sense); -#endif - PyList_Append(list, (PyObject *) cf); - Py_DECREF(cf); - } - - ps = rpmpsFree(ps); - - return list; - } - - Py_INCREF(Py_None); - return Py_None; -} - -/** \ingroup python - */ -static PyObject * rpmts_Order(rpmtsObject * s, PyObject * args) { - int xx; - - if (!PyArg_ParseTuple(args, "")) return NULL; - - xx = rpmtsOrder(s->ts); - - Py_INCREF(Py_None); - return Py_None; -} - -/** \ingroup python - */ -static PyObject * rpmts_GetKeys(rpmtsObject * s, PyObject * args) { - const void **data = NULL; - int num, i; - PyObject *tuple; - - rpmtsGetKeys(s->ts, &data, &num); - if (data == NULL) { - Py_INCREF(Py_None); - return Py_None; - } - - tuple = PyTuple_New(num); - - for (i = 0; i < num; i++) { - PyObject *obj = (PyObject *) data[i]; - Py_INCREF(obj); - PyTuple_SetItem(tuple, i, obj); - } - - free (data); - - return tuple; -} - -/** \ingroup python - */ -struct tsCallbackType { - PyObject * cb; - PyObject * data; - int pythonError; -}; - -/** \ingroup python - * @todo Remove, there's no headerLink refcount on the pointer. - */ -static Header transactionSetHeader = NULL; - -/** \ingroup python - */ -static void * tsCallback(const void * hd, const rpmCallbackType what, - const unsigned long amount, const unsigned long total, - const void * pkgKey, rpmCallbackData data) { - struct tsCallbackType * cbInfo = data; - PyObject * args, * result; - int fd; - static FD_t fdt; - const Header h = (Header) hd; - - if (cbInfo->pythonError) return NULL; - if (cbInfo->cb == Py_None) return NULL; - - if (!pkgKey) pkgKey = Py_None; - transactionSetHeader = h; - - args = Py_BuildValue("(illOO)", what, amount, total, pkgKey, cbInfo->data); - result = PyEval_CallObject(cbInfo->cb, args); - Py_DECREF(args); - - if (!result) { - cbInfo->pythonError = 1; - return NULL; - } - - if (what == RPMCALLBACK_INST_OPEN_FILE) { - if (!PyArg_Parse(result, "i", &fd)) { - cbInfo->pythonError = 1; - return NULL; - } - fdt = fdDup(fd); - - Py_DECREF(result); - return fdt; - } - - if (what == RPMCALLBACK_INST_CLOSE_FILE) { - Fclose (fdt); - } - - Py_DECREF(result); - - return NULL; -} - -/** \ingroup python - */ -static PyObject * rpmts_Run(rpmtsObject * s, PyObject * args) -{ - int flags, ignoreSet; - int rc, i; - PyObject * list; - rpmps ps; - struct tsCallbackType cbInfo; - - if (!PyArg_ParseTuple(args, "iiOO", &flags, &ignoreSet, &cbInfo.cb, - &cbInfo.data)) - return NULL; - - cbInfo.pythonError = 0; - - (void) rpmtsSetNotifyCallback(s->ts, tsCallback, (void *) &cbInfo); - (void) rpmtsSetFlags(s->ts, flags); - - rc = rpmtsRun(s->ts, NULL, ignoreSet); - ps = rpmtsGetProblems(s->ts); - - if (cbInfo.pythonError) { - ps = rpmpsFree(ps); - return NULL; - } - - if (rc < 0) { - list = PyList_New(0); - return list; - } else if (!rc) { - Py_INCREF(Py_None); - return Py_None; - } - - list = PyList_New(0); - for (i = 0; i < ps->numProblems; i++) { - rpmProblem p = ps->probs + i; - PyObject * prob = Py_BuildValue("s(isN)", rpmProblemString(p), - p->type, - p->str1, - PyLong_FromLongLong(p->ulong1)); - PyList_Append(list, prob); - Py_DECREF(prob); - } - - ps = rpmpsFree(ps); - - return list; -} - -/** \ingroup python - */ -static struct PyMethodDef rpmtsMethods[] = { - {"add", (PyCFunction) rpmts_Add, 1 }, - {"remove", (PyCFunction) rpmts_Remove, 1 }, - {"depcheck", (PyCFunction) rpmts_Check, 1 }, - {"order", (PyCFunction) rpmts_Order, 1 }, - {"getKeys", (PyCFunction) rpmts_GetKeys, 1 }, - {"run", (PyCFunction) rpmts_Run, 1 }, - {NULL, NULL} /* sentinel */ -}; - -/** \ingroup python - */ -static PyObject * rpmts_getattr(rpmtsObject * o, char * name) { - return Py_FindMethod(rpmtsMethods, (PyObject *) o, name); -} - -/** \ingroup python - */ -static void rpmts_dealloc(PyObject * o) { - rpmtsObject * trans = (void *) o; - - trans->ts->rdb = NULL; /* XXX HACK: avoid rpmdb close/free */ - rpmtsFree(trans->ts); - if (trans->dbo) { - Py_DECREF(trans->dbo); - } - if (trans->scriptFd) Fclose(trans->scriptFd); - /* this will free the keyList, and decrement the ref count of all - the items on the list as well :-) */ - Py_DECREF(trans->keyList); - PyMem_DEL(o); -} - -/** \ingroup python - */ -static int rpmts_setattr(rpmtsObject * o, char * name, - PyObject * val) { - int i; - - if (!strcmp(name, "scriptFd")) { - if (!PyArg_Parse(val, "i", &i)) return 0; - if (i < 0) { - PyErr_SetString(PyExc_TypeError, "bad file descriptor"); - return -1; - } else { - o->scriptFd = fdDup(i); - rpmtsSetScriptFd(o->ts, o->scriptFd); - } - } else { - PyErr_SetString(PyExc_AttributeError, name); - return -1; - } - - return 0; -} - -/** \ingroup python - */ -static PyTypeObject rpmts_Type = { - PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ - "rpm.ts", /* tp_name */ - sizeof(rpmtsObject), /* tp_size */ - 0, /* tp_itemsize */ - (destructor) rpmts_dealloc, /* tp_dealloc */ - 0, /* tp_print */ - (getattrfunc) rpmts_getattr, /* tp_getattr */ - (setattrfunc) rpmts_setattr, /* tp_setattr */ - 0, /* tp_compare */ - 0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - 0, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT, /* tp_flags */ - 0, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - 0, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - 0, /* tp_init */ - 0, /* tp_alloc */ - 0, /* tp_new */ - 0, /* tp_free */ - 0, /* tp_is_gc */ -}; - -/*@}*/ - -/** \ingroup python * \name Module: rpm */ /*@{*/ /** */ -static PyObject * rpmts_Create(PyObject * self, PyObject * args) { - rpmtsObject * o; - rpmdbObject * db = NULL; - char * rootDir = "/"; - - if (!PyArg_ParseTuple(args, "|sO", &rootDir, &db)) return NULL; - if (db && ((PyObject *) db)->ob_type != &rpmdbType) { - PyErr_SetString(PyExc_TypeError, "bad type for database argument"); - return NULL; - } - - o = (void *) PyObject_NEW(rpmtsObject, &rpmts_Type); - - Py_XINCREF(db); - o->dbo = db; - o->scriptFd = NULL; - o->ts = rpmtsCreate(); - (void) rpmtsSetRootDir(o->ts, rootDir); - /* XXX this will be fun to fix */ - o->ts->rdb = (db ? dbFromDb(db) : NULL); - o->keyList = PyList_New(0); - - return (void *) o; -} - -/** - */ static PyObject * doAddMacro(PyObject * self, PyObject * args) { char * name, * val; @@ -888,21 +333,6 @@ static PyObject * checkSig (PyObject * self, PyObject * args) { return Py_BuildValue("i", rc); } -/* hack to get the current header that's in the transaction set */ -/** - */ -static PyObject * getTsHeader (PyObject * self, PyObject * args) { - - if (!PyArg_ParseTuple(args, "")) - return NULL; - - if (transactionSetHeader) { - return (PyObject *) createHeaderObject(transactionSetHeader); - } - Py_INCREF(Py_None); - return (PyObject *) Py_None; -} - static PyObject * setVerbosity (PyObject * self, PyObject * args) { int level; @@ -1039,9 +469,9 @@ static PyMethodDef rpmModuleMethods[] = { { "versionCompare", (PyCFunction) versionCompare, METH_VARARGS, NULL }, { "labelCompare", (PyCFunction) labelCompare, METH_VARARGS, NULL }, { "checksig", (PyCFunction) checkSig, METH_VARARGS, NULL }, - { "getTransactionCallbackHeader", (PyCFunction) getTsHeader, METH_VARARGS, NULL }, { "Fopen", (PyCFunction) doFopen, METH_VARARGS, NULL }, { "setVerbosity", (PyCFunction) setVerbosity, METH_VARARGS, NULL }, + { "rpmdsSingle", (PyCFunction) rpmds_Single, METH_VARARGS, NULL }, { NULL } } ; diff --git a/python/rpmts-py.c b/python/rpmts-py.c new file mode 100644 index 0000000..c0decb3 --- /dev/null +++ b/python/rpmts-py.c @@ -0,0 +1,555 @@ +/** \ingroup python + * \file python/rpmmodule.c + */ + +#include "system.h" + +#include "Python.h" + +#include "rpmdb.h" +#include "rpmps.h" + +#define _RPMTS_INTERNAL /* XXX for ts->rdb */ +#include "rpmts.h" + +#include "db-py.h" +#include "header-py.h" +#include "rpmts-py.h" + +#include "debug.h" + +/** \ingroup python + * \name Class: rpmtrans + * \class rpmtrans + * \brief A python rpmtrans object represents an RPM transaction set. + * + * The transaction set is the workhorse of RPM. It performs the + * installation and upgrade of packages. The rpmtrans object is + * instantiated by the TransactionSet function in the rpm module. + * + * The TransactionSet function takes two optional arguments. The first + * argument is the root path, the second is an open database to perform + * the transaction set upon. + * + * A rpmtrans object has the following methods: + * + * - add(header,data,mode) Add a binary package to a transaction set. + * @param header the header to be added + * @param data user data that will be passed to the transaction callback + * during transaction execution + * @param mode optional argument that specifies if this package should + * be installed ('i'), upgraded ('u'), or if it is just + * available to the transaction when computing + * dependencies but no action should be performed with it + * ('a'). + * + * - remove + * + * - depcheck() Perform a dependency and conflict check on the + * transaction set. After headers have been added to a + * transaction set, a dependency check can be performed + * to make sure that all package dependencies are + * satisfied. + * @return None If there are no unresolved dependencies + * Otherwise a list of complex tuples is returned, one tuple per + * unresolved dependency, with + * The format of the dependency tuple is: + * ((packageName, packageVersion, packageRelease), + * (reqName, reqVersion), + * needsFlags, + * suggestedPackage, + * sense) + * packageName, packageVersion, packageRelease are the name, + * version, and release of the package that has the unresolved + * dependency or conflict. + * The reqName and reqVersion are the name and version of the + * requirement or conflict. + * The needsFlags is a bitfield that describes the versioned + * nature of a requirement or conflict. The constants + * rpm.RPMSENSE_LESS, rpm.RPMSENSE_GREATER, and + * rpm.RPMSENSE_EQUAL can be logical ANDed with the needsFlags + * to get versioned dependency information. + * suggestedPackage is a tuple if the dependency check was aware + * of a package that solves this dependency problem when the + * dependency check was run. Packages that are added to the + * transaction set as "available" are examined during the + * dependency check as possible dependency solvers. The tuple + * contains two values, (header, suggestedName). These are set to + * the header of the suggested package and its name, respectively. + * If there is no known package to solve the dependency problem, + * suggestedPackage is None. + * The constants rpm.RPMDEP_SENSE_CONFLICTS and + * rpm.RPMDEP_SENSE_REQUIRES are set to show a dependency as a + * requirement or a conflict. + * + * - run(flags,problemSetFilter,callback,data) Attempt to execute a + * transaction set. After the transaction set has been populated + * with install and upgrade actions, it can be executed by invoking + * the run() method. + * @param flags - modifies the behavior of the transaction set as it is + * processed. The following values can be locical ORed + * together: + * - rpm.RPMTRANS_FLAG_TEST - test mode, do not modify the RPM + * database, change any files, or run any package scripts + * - rpm.RPMTRANS_FLAG_BUILD_PROBS - only build a list of + * problems encountered when attempting to run this transaction + * set + * - rpm.RPMTRANS_FLAG_NOSCRIPTS - do not execute package scripts + * - rpm.RPMTRANS_FLAG_JUSTDB - only make changes to the rpm + * database, do not modify files. + * - rpm.RPMTRANS_FLAG_NOTRIGGERS - do not run trigger scripts + * - rpm.RPMTRANS_FLAG_NODOCS - do not install files marked as %doc + * - rpm.RPMTRANS_FLAG_ALLFILES - create all files, even if a + * file is marked %config(missingok) and an upgrade is + * being performed. + * - rpm.RPMTRANS_FLAG_KEEPOBSOLETE - do not remove obsoleted + * packages. + * @param problemSetFilter - control bit(s) to ignore classes of problems, + * any of + * - rpm.RPMPROB_FILTER_IGNOREOS - + * - rpm.RPMPROB_FILTER_IGNOREARCH - + * - rpm.RPMPROB_FILTER_REPLACEPKG - + * - rpm.RPMPROB_FILTER_FORCERELOCATE - + * - rpm.RPMPROB_FILTER_REPLACENEWFILES - + * - rpm.RPMPROB_FILTER_REPLACEOLDFILES - + * - rpm.RPMPROB_FILTER_OLDPACKAGE - + * - rpm.RPMPROB_FILTER_DISKSPACE - + */ + +/** \ingroup python + */ +static PyObject * +rpmts_Add(rpmtsObject * s, PyObject * args) +{ + hdrObject * h; + PyObject * key; + char * how = NULL; + int isUpgrade = 0; + PyObject * hObj; + + if (!PyArg_ParseTuple(args, "OO|s", &h, &key, &how)) return NULL; + + hObj = (PyObject *) h; + if (hObj->ob_type != &hdr_Type) { + PyErr_SetString(PyExc_TypeError, "bad type for header argument"); + return NULL; + } + + if (how && strcmp(how, "a") && strcmp(how, "u") && strcmp(how, "i")) { + PyErr_SetString(PyExc_TypeError, "how argument must be \"u\", \"a\", or \"i\""); + return NULL; + } else if (how && !strcmp(how, "u")) + isUpgrade = 1; + + if (how && !strcmp(how, "a")) + rpmtsAvailablePackage(s->ts, hdrGetHeader(h), key); + else + rpmtsAddPackage(s->ts, hdrGetHeader(h), key, isUpgrade, NULL); + + /* This should increment the usage count for me */ + if (key) { + PyList_Append(s->keyList, key); + } + + Py_INCREF(Py_None); + return Py_None; +} + +/** \ingroup python + */ +static PyObject * +rpmts_Remove(rpmtsObject * s, PyObject * args) +{ + char * name; + int count; + rpmdbMatchIterator mi; + + if (!PyArg_ParseTuple(args, "s", &name)) + return NULL; + + /* XXX: Copied hack from ../lib/rpminstall.c, rpmErase() */ + mi = rpmdbInitIterator(dbFromDb(s->dbo), RPMDBI_LABEL, name, 0); + count = rpmdbGetIteratorCount(mi); + if (count <= 0) { + PyErr_SetString(pyrpmError, "package not installed"); + return NULL; + } else { /* XXX: Note that we automatically choose to remove all matches */ + Header h; + while ((h = rpmdbNextIterator(mi)) != NULL) { + unsigned int recOffset = rpmdbGetIteratorOffset(mi); + if (recOffset) { + rpmtsRemovePackage(s->ts, h, recOffset); + } + } + } + rpmdbFreeIterator(mi); + + Py_INCREF(Py_None); + return Py_None; +} + +/** \ingroup python + */ +static PyObject * +rpmts_Check(rpmtsObject * s, PyObject * args) +{ + rpmps ps; + rpmProblem p; + PyObject * list, * cf; + int i; + int allSuggestions = 0; + int xx; + + if (!PyArg_ParseTuple(args, "|i", &allSuggestions)) return NULL; + + xx = rpmtsCheck(s->ts); + ps = rpmtsGetProblems(s->ts); + if (ps) { + list = PyList_New(0); + + /* XXX TODO: rpmlib >= 4.0.3 can return multiple suggested keys. */ + for (i = 0; i < ps->numProblems; i++) { +#ifdef DYING + cf = Py_BuildValue("((sss)(ss)iOi)", conflicts[i].byName, + conflicts[i].byVersion, conflicts[i].byRelease, + + conflicts[i].needsName, + conflicts[i].needsVersion, + + conflicts[i].needsFlags, + conflicts[i].suggestedPkgs ? + conflicts[i].suggestedPkgs[0] : Py_None, + conflicts[i].sense); +#else + char * byName, * byVersion, * byRelease; + char * needsName, * needsOP, * needsVersion; + int needsFlags, sense; + fnpyKey key; + + p = ps->probs + i; + + byName = p->pkgNEVR; + if ((byRelease = strrchr(byName, '-')) != NULL) + *byRelease++ = '\0'; + if ((byVersion = strrchr(byName, '-')) != NULL) + *byVersion++ = '\0'; + + key = p->key; + + needsName = p->altNEVR; + if (needsName[1] == ' ') { + sense = (needsName[0] == 'C') + ? RPMDEP_SENSE_CONFLICTS : RPMDEP_SENSE_REQUIRES; + needsName += 2; + } else + sense = RPMDEP_SENSE_REQUIRES; + if ((needsVersion = strrchr(needsName, ' ')) != NULL) + *needsVersion++ = '\0'; + + needsFlags = 0; + if ((needsOP = strrchr(needsName, ' ')) != NULL) { + for (*needsOP++ = '\0'; *needsOP != '\0'; needsOP++) { + if (*needsOP == '<') needsFlags |= RPMSENSE_LESS; + else if (*needsOP == '>') needsFlags |= RPMSENSE_GREATER; + else if (*needsOP == '=') needsFlags |= RPMSENSE_EQUAL; + } + } + + cf = Py_BuildValue("((sss)(ss)iOi)", byName, byVersion, byRelease, + needsName, needsVersion, needsFlags, + (key != NULL ? key : Py_None), + sense); +#endif + PyList_Append(list, (PyObject *) cf); + Py_DECREF(cf); + } + + ps = rpmpsFree(ps); + + return list; + } + + Py_INCREF(Py_None); + return Py_None; +} + +/** \ingroup python + */ +static PyObject * +rpmts_Order(rpmtsObject * s, PyObject * args) +{ + int xx; + + if (!PyArg_ParseTuple(args, "")) return NULL; + + xx = rpmtsOrder(s->ts); + + Py_INCREF(Py_None); + return Py_None; +} + +/** \ingroup python + */ +static PyObject * +rpmts_GetKeys(rpmtsObject * s, PyObject * args) +{ + const void **data = NULL; + int num, i; + PyObject *tuple; + + rpmtsGetKeys(s->ts, &data, &num); + if (data == NULL) { + Py_INCREF(Py_None); + return Py_None; + } + + tuple = PyTuple_New(num); + + for (i = 0; i < num; i++) { + PyObject *obj = (PyObject *) data[i]; + Py_INCREF(obj); + PyTuple_SetItem(tuple, i, obj); + } + + free (data); + + return tuple; +} + +/** \ingroup python + */ +struct rpmtsCallbackType_s { + PyObject * cb; + PyObject * data; + int pythonError; +}; + +/** \ingroup python + */ +static void * +rpmtsCallback(const void * hd, const rpmCallbackType what, + const unsigned long amount, const unsigned long total, + const void * pkgKey, rpmCallbackData data) +{ + struct rpmtsCallbackType_s * cbInfo = data; + PyObject * args, * result; + int fd; + static FD_t fdt; + + if (cbInfo->pythonError) return NULL; + if (cbInfo->cb == Py_None) return NULL; + + if (!pkgKey) pkgKey = Py_None; + + args = Py_BuildValue("(illOO)", what, amount, total, pkgKey, cbInfo->data); + result = PyEval_CallObject(cbInfo->cb, args); + Py_DECREF(args); + + if (!result) { + cbInfo->pythonError = 1; + return NULL; + } + + if (what == RPMCALLBACK_INST_OPEN_FILE) { + if (!PyArg_Parse(result, "i", &fd)) { + cbInfo->pythonError = 1; + return NULL; + } + fdt = fdDup(fd); + + Py_DECREF(result); + return fdt; + } + + if (what == RPMCALLBACK_INST_CLOSE_FILE) { + Fclose (fdt); + } + + Py_DECREF(result); + + return NULL; +} + +/** \ingroup python + */ +static PyObject * rpmts_Run(rpmtsObject * s, PyObject * args) +{ + int flags, ignoreSet; + int rc, i; + PyObject * list; + rpmps ps; + struct rpmtsCallbackType_s cbInfo; + + if (!PyArg_ParseTuple(args, "iiOO", &flags, &ignoreSet, &cbInfo.cb, + &cbInfo.data)) + return NULL; + + cbInfo.pythonError = 0; + + (void) rpmtsSetNotifyCallback(s->ts, rpmtsCallback, (void *) &cbInfo); + (void) rpmtsSetFlags(s->ts, flags); + + rc = rpmtsRun(s->ts, NULL, ignoreSet); + ps = rpmtsGetProblems(s->ts); + + if (cbInfo.pythonError) { + ps = rpmpsFree(ps); + return NULL; + } + + if (rc < 0) { + list = PyList_New(0); + return list; + } else if (!rc) { + Py_INCREF(Py_None); + return Py_None; + } + + list = PyList_New(0); + for (i = 0; i < ps->numProblems; i++) { + rpmProblem p = ps->probs + i; + PyObject * prob = Py_BuildValue("s(isN)", rpmProblemString(p), + p->type, + p->str1, + PyLong_FromLongLong(p->ulong1)); + PyList_Append(list, prob); + Py_DECREF(prob); + } + + ps = rpmpsFree(ps); + + return list; +} + +/** \ingroup python + */ +static struct PyMethodDef rpmtsMethods[] = { + {"add", (PyCFunction) rpmts_Add, 1 }, + {"remove", (PyCFunction) rpmts_Remove, 1 }, + {"depcheck", (PyCFunction) rpmts_Check, 1 }, + {"order", (PyCFunction) rpmts_Order, 1 }, + {"getKeys", (PyCFunction) rpmts_GetKeys, 1 }, + {"run", (PyCFunction) rpmts_Run, 1 }, + {NULL, NULL} /* sentinel */ +}; + +/** \ingroup python + */ +static PyObject * rpmts_getattr(rpmtsObject * o, char * name) { + return Py_FindMethod(rpmtsMethods, (PyObject *) o, name); +} + +/** \ingroup python + */ +static void rpmts_dealloc(PyObject * o) { + rpmtsObject * trans = (void *) o; + + trans->ts->rdb = NULL; /* XXX HACK: avoid rpmdb close/free */ + rpmtsFree(trans->ts); + if (trans->dbo) { + Py_DECREF(trans->dbo); + } + if (trans->scriptFd) Fclose(trans->scriptFd); + /* this will free the keyList, and decrement the ref count of all + the items on the list as well :-) */ + Py_DECREF(trans->keyList); + PyMem_DEL(o); +} + +/** \ingroup python + */ +static int rpmts_setattr(rpmtsObject * o, char * name, + PyObject * val) { + int i; + + if (!strcmp(name, "scriptFd")) { + if (!PyArg_Parse(val, "i", &i)) return 0; + if (i < 0) { + PyErr_SetString(PyExc_TypeError, "bad file descriptor"); + return -1; + } else { + o->scriptFd = fdDup(i); + rpmtsSetScriptFd(o->ts, o->scriptFd); + } + } else { + PyErr_SetString(PyExc_AttributeError, name); + return -1; + } + + return 0; +} + +/** \ingroup python + */ +PyTypeObject rpmts_Type = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + "rpm.ts", /* tp_name */ + sizeof(rpmtsObject), /* tp_size */ + 0, /* tp_itemsize */ + (destructor) rpmts_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + (getattrfunc) rpmts_getattr, /* tp_getattr */ + (setattrfunc) rpmts_setattr, /* tp_setattr */ + 0, /* tp_compare */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT, /* tp_flags */ + 0, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ + 0, /* tp_free */ + 0, /* tp_is_gc */ +}; + +/** + */ +rpmtsObject * +rpmts_Create(PyObject * self, PyObject * args) +{ + rpmtsObject * o; + rpmdbObject * db = NULL; + char * rootDir = "/"; + + if (!PyArg_ParseTuple(args, "|sO", &rootDir, &db)) return NULL; + if (db && ((PyObject *) db)->ob_type != &rpmdbType) { + PyErr_SetString(PyExc_TypeError, "bad type for database argument"); + return NULL; + } + + o = (void *) PyObject_NEW(rpmtsObject, &rpmts_Type); + + Py_XINCREF(db); + o->dbo = db; + o->scriptFd = NULL; + o->ts = rpmtsCreate(); + (void) rpmtsSetRootDir(o->ts, rootDir); + /* XXX this will be fun to fix */ + o->ts->rdb = (db ? dbFromDb(db) : NULL); + o->keyList = PyList_New(0); + + return o; +} diff --git a/python/rpmts-py.h b/python/rpmts-py.h new file mode 100644 index 0000000..f564010 --- /dev/null +++ b/python/rpmts-py.h @@ -0,0 +1,30 @@ +#ifndef H_RPMTS_PY +#define H_RPMTS_PY + +/** \ingroup python + * \file python/rpmts-py.h + */ + +typedef struct rpmtsObject_s { + PyObject_HEAD + rpmts ts; + rpmdbObject * dbo; + PyObject * keyList; /* keeps reference counts correct */ + FD_t scriptFd; +} rpmtsObject; + +extern PyTypeObject rpmts_Type; + +/* XXX These names/constants have been removed from the rpmlib API. */ +enum { + RPMDEP_SENSE_REQUIRES, /*!< requirement not satisfied. */ + RPMDEP_SENSE_CONFLICTS /*!< conflict was found. */ +}; + +rpmts tsFromTs(rpmtsObject * ts); + +rpmtsObject * rpmts_New(rpmts ts); + +rpmtsObject * rpmts_Create(PyObject * s, PyObject * args); + +#endif -- 2.7.4