From e6ba507f771047db75773b166dc137b0a3e46ef7 Mon Sep 17 00:00:00 2001 From: jbj Date: Mon, 6 May 2002 19:48:14 +0000 Subject: [PATCH] - rework most of rpmdb.c prepatory to implementing duplicates. - fix: 2 memory leaks in headerSprintf. - fix: db mire's access out-of-bounds memory. CVS patchset: 5423 CVS date: 2002/05/06 19:48:14 --- CHANGES | 3 + Doxyfile.in | 1 - lib/rpmlib.h | 34 +--- po/POTFILES.in | 1 - po/cs.po | 221 ++++++++++------------ po/da.po | 211 ++++++++++----------- po/de.po | 215 ++++++++++------------ po/fi.po | 209 +++++++++------------ po/fr.po | 209 +++++++++------------ po/gl.po | 189 ++++++++----------- po/is.po | 192 ++++++++----------- po/ja.po | 213 ++++++++++----------- po/ko.po | 224 +++++++++++----------- po/no.po | 194 ++++++++----------- po/pl.po | 213 ++++++++++----------- po/pt_BR.po | 217 ++++++++++------------ po/ro.po | 189 ++++++++----------- po/rpm.pot | 189 ++++++++----------- po/ru.po | 220 ++++++++++------------ po/sk.po | 213 ++++++++++----------- po/sl.po | 218 ++++++++++------------ po/sr.po | 209 +++++++++------------ po/sv.po | 218 ++++++++++------------ po/tr.po | 222 ++++++++++------------ popt/po/cs.po | 2 +- popt/po/da.po | 2 +- popt/po/de.po | 2 +- popt/po/es.po | 2 +- popt/po/eu_ES.po | 2 +- popt/po/fi.po | 2 +- popt/po/fr.po | 2 +- popt/po/gl.po | 2 +- popt/po/hu.po | 2 +- popt/po/id.po | 2 +- popt/po/is.po | 2 +- popt/po/it.po | 2 +- popt/po/ja.po | 2 +- popt/po/ko.po | 2 +- popt/po/no.po | 2 +- popt/po/pl.po | 2 +- popt/po/popt.pot | 2 +- popt/po/pt_BR.po | 2 +- popt/po/ro.po | 2 +- popt/po/ru.po | 2 +- popt/po/sk.po | 2 +- popt/po/sl.po | 2 +- popt/po/sr.po | 2 +- popt/po/sv.po | 2 +- popt/po/tr.po | 2 +- popt/po/uk.po | 2 +- popt/po/wa.po | 2 +- popt/po/zh.po | 2 +- popt/po/zh_CN.GB2312.po | 2 +- rpm.spec.in | 5 + rpmdb/header.c | 20 +- rpmdb/rpmdb.c | 480 +++++++++++++++++++++--------------------------- 56 files changed, 2079 insertions(+), 2708 deletions(-) diff --git a/CHANGES b/CHANGES index ff8f220..21ee452 100644 --- a/CHANGES +++ b/CHANGES @@ -108,6 +108,9 @@ - eliminate db1 support. - enable CDB by default. - use DBT_DB_MALLOC to eliminate re-malloc'ing header blobs. + - rework most of rpmdb.c prepatory to implementing duplicates. + - fix: 2 memory leaks in headerSprintf. + - fix: db mire's access out-of-bounds memory. 4.0.3 -> 4.0.4: - solaris: translate i86pc to i386 (#57182). diff --git a/Doxyfile.in b/Doxyfile.in index 482ae18..6b747ec 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -398,7 +398,6 @@ INPUT = \ @top_srcdir@/lib/stringbuf.h \ @top_srcdir@/lib/transaction.c \ @top_srcdir@/lib/verify.c \ - @top_srcdir@/rpmdb/db1.c \ @top_srcdir@/rpmdb/db3.c \ @top_srcdir@/rpmdb/dbconfig.c \ @top_srcdir@/rpmdb/fprint.c \ diff --git a/lib/rpmlib.h b/lib/rpmlib.h index d1f9d43..1b0655d 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -821,10 +821,10 @@ int rpmdbPruneIterator(/*@null@*/ rpmdbMatchIterator mi, * Tag value pattern match mode. */ typedef enum rpmMireMode_e { - RPMMIRE_DEFAULT = 0, /*!< regex with \., .* and ^...$ */ + RPMMIRE_DEFAULT = 0, /*!< regex with \., .* and ^...$ added */ RPMMIRE_STRCMP = 1, /*!< strcmp on strings */ RPMMIRE_REGEX = 2, /*!< regex patterns */ - RPMMIRE_GLOB = 3 /*!< glob patterns */ + RPMMIRE_GLOB = 3 /*!< glob patterns through fnmatch(3) */ } rpmMireMode; /** \ingroup rpmdb @@ -840,36 +840,6 @@ int rpmdbSetIteratorRE(/*@null@*/ rpmdbMatchIterator mi, rpmTag tag, /*@modifies mi @*/; /** \ingroup rpmdb - * Modify iterator to filter out headers that do not match version. - * @deprecated Use - * rpmdbSetIteratorRE(mi, RPMTAG_VERSION, RPMMIRE_DEFAULT, version) - * instead. - * @todo Eliminate from API. - * @param mi rpm database iterator - * @param version version to match (can be a regex pattern) - * @return 0 on success - */ -/*@unused@*/ -int rpmdbSetIteratorVersion(/*@null@*/ rpmdbMatchIterator mi, - /*@null@*/ const char * version) - /*@modifies mi @*/; - -/** \ingroup rpmdb - * Modify iterator to filter out headers that do not match release. - * @deprecated Use - * rpmdbSetIteratorRE(mi, RPMTAG_RELEASE, RPMMIRE_DEFAULT, release) - * instead. - * @todo Eliminate from API. - * @param mi rpm database iterator - * @param release release to match (can be a regex pattern) - * @return 0 on success - */ -/*@unused@*/ -int rpmdbSetIteratorRelease(/*@null@*/ rpmdbMatchIterator mi, - /*@null@*/ const char * release) - /*@modifies mi @*/; - -/** \ingroup rpmdb * Prepare iterator for lazy writes. * @note Must be called before rpmdbNextIterator() in CDB model database. * @param mi rpm database iterator diff --git a/po/POTFILES.in b/po/POTFILES.in index 161d217..41cd08e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -50,7 +50,6 @@ lib/signature.c lib/stringbuf.c lib/transaction.c lib/verify.c -rpmdb/db1.c rpmdb/db3.c rpmdb/dbconfig.c rpmdb/hdrNVR.c diff --git a/po/cs.po b/po/cs.po index 27aadd9..057f017 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-02 19:33-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -1511,7 +1511,7 @@ msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 +#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028 msgid "(not a number)" msgstr "(není èíslo)" @@ -2835,63 +2835,16 @@ msgstr "Nevy msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "%s-%s-%s: kontrola digestu v hlavièce selhala\n" -#: rpmdb/db1.c:98 rpmdb/db3.c:85 +#: rpmdb/db3.c:85 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "db%d chyba (%d) z %s: %s\n" -#: rpmdb/db1.c:101 rpmdb/db3.c:88 +#: rpmdb/db3.c:88 #, c-format msgid "db%d error(%d): %s\n" msgstr "db%d chyba (%d): %s\n" -#: rpmdb/db1.c:168 -#, c-format -msgid "" -"Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" -msgstr "" -"Poru¹ený øetìzec v balíèku na offsetu %d(0x%08x), zkou¹ím znovu pøipojit...\n" - -#: rpmdb/db1.c:180 -#, c-format -msgid "Reconnecting broken chain at offset %d(0x%08x).\n" -msgstr "Pøipojuji poru¹ený øetìzec na offsetu %d(0x%08x).\n" - -#. @=branchstate@ -#: rpmdb/db1.c:506 -#, c-format -msgid "closed db file %s\n" -msgstr "zavøen db soubor %s\n" - -#: rpmdb/db1.c:509 -#, c-format -msgid "removed db file %s\n" -msgstr "odstranìn db soubor %s\n" - -#: rpmdb/db1.c:544 -#, c-format -msgid "bad db file %s\n" -msgstr "¹patný db soubor %s\n" - -#: rpmdb/db1.c:549 -#, c-format -msgid "opening db file %s mode 0x%x\n" -msgstr "otevírám db soubor %s mode 0x%x\n" - -#. XXX check errno validity -#: rpmdb/db1.c:572 -#, c-format -msgid "cannot get %s lock on database\n" -msgstr "nemohu vytvoøit zámek %s na databázi\n" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "exclusive" -msgstr "výhradní" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "shared" -msgstr "sdílený" - #: rpmdb/db3.c:114 #, c-format msgid "closed db environment %s/%s\n" @@ -2907,27 +2860,35 @@ msgstr "odstran msgid "opening db environment %s/%s %s\n" msgstr "otevírám db environment %s/%s %s\n" -#: rpmdb/db3.c:561 +#: rpmdb/db3.c:605 #, c-format msgid "closed db index %s/%s\n" msgstr "uzavøen db index %s/%s\n" -#: rpmdb/db3.c:628 +#: rpmdb/db3.c:672 #, c-format msgid "verified db index %s/%s\n" msgstr "uzavøen db index %s/%s\n" -#: rpmdb/db3.c:850 +#: rpmdb/db3.c:894 #, 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:1066 +#: rpmdb/db3.c:1110 #, 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:1072 +#: rpmdb/db3.c:1112 +msgid "exclusive" +msgstr "výhradní" + +#: rpmdb/db3.c:1112 +msgid "shared" +msgstr "sdílený" + +#: rpmdb/db3.c:1116 #, c-format msgid "locked db index %s/%s\n" msgstr "uzamèen db index %s/%s\n" @@ -2959,72 +2920,72 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "Poèet dataLength() RPM_STRING_TYPE musí být 1.\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2208 +#: rpmdb/header.c:2210 msgid "missing { after %" msgstr "chybí { po %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2238 +#: rpmdb/header.c:2240 msgid "missing } after %{" msgstr "po %{ chybí }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2254 msgid "empty tag format" msgstr "prázdný formát znaèky" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2268 msgid "empty tag name" msgstr "prázdné jméno znaèky" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2283 +#: rpmdb/header.c:2285 msgid "unknown tag" msgstr "neznámá znaèka" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2310 +#: rpmdb/header.c:2312 msgid "] expected at end of array" msgstr "na konci pole oèekáváno ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2330 msgid "unexpected ]" msgstr "neoèekávaná ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2332 +#: rpmdb/header.c:2334 msgid "unexpected }" msgstr "neoèekávaná }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2398 +#: rpmdb/header.c:2401 msgid "? expected in expression" msgstr "ve výrazu oèekáván ?" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2407 +#: rpmdb/header.c:2410 msgid "{ expected after ? in expression" msgstr "ve výrazu je po ? oèekávána {" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2420 rpmdb/header.c:2462 +#: rpmdb/header.c:2423 rpmdb/header.c:2468 msgid "} expected in expression" msgstr "ve výrazu je oèekávána }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2430 +#: rpmdb/header.c:2433 msgid ": expected following ? subexpression" msgstr "v podvýrazu je po ? oèekávána :" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2447 +#: rpmdb/header.c:2453 msgid "{ expected after : in expression" msgstr "ve výrazu je po : oèekávána {" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2472 +#: rpmdb/header.c:2478 msgid "| expected at end of expression" msgstr "na konci výrazu je oèekáváno |" @@ -3045,150 +3006,145 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "generovat hlavièky kompatibilní RPM verze 2 a 3" #. @-modfilesys@ -#: rpmdb/rpmdb.c:161 +#: rpmdb/rpmdb.c:162 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: neznámá znaèka: \"%s\" ignorována\n" -#: rpmdb/rpmdb.c:254 +#: rpmdb/rpmdb.c:234 #, 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:276 +#: rpmdb/rpmdb.c:256 #, c-format msgid "cannot open %s index\n" msgstr "nemohu otevøít index %s\n" -#: rpmdb/rpmdb.c:377 -#, 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" - -#: rpmdb/rpmdb.c:518 -#, 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:538 -#, 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:797 +#: rpmdb/rpmdb.c:695 msgid "no dbpath has been set\n" msgstr "nebyla nastavena dbpath\n" -#. error -#: rpmdb/rpmdb.c:1183 -#, c-format -msgid "error(%d) counting packages\n" -msgstr "chyba(%d) pøi poèítání balíèkù\n" - -#: rpmdb/rpmdb.c:1986 rpmdb/rpmdb.c:3386 +#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007 +#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787 #, 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" +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" -#: rpmdb/rpmdb.c:2052 +#: rpmdb/rpmdb.c:1930 #, 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:2326 +#: rpmdb/rpmdb.c:2189 #, 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:2495 +#: rpmdb/rpmdb.c:2354 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstraòuji \"%s\" z indexu %s.\n" -#: rpmdb/rpmdb.c:2499 +#: rpmdb/rpmdb.c:2358 #, c-format msgid "removing %d entries from %s index.\n" msgstr "odstraòuji %d polo¾ek z indexu %s.\n" -#: rpmdb/rpmdb.c:2692 +#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803 +#, 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:2416 +#, 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:2557 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "chyba(%d) pøi alokaci nové instance balíèku\n" -#: rpmdb/rpmdb.c:2887 +#: rpmdb/rpmdb.c:2763 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "pøidávám \"%s\" do indexu %s\n" -#: rpmdb/rpmdb.c:2891 +#: rpmdb/rpmdb.c:2767 #, 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:3272 +#: rpmdb/rpmdb.c:3137 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "odstraòuji %s po úspì¹ném znovusestavení db3.\n" -#: rpmdb/rpmdb.c:3305 +#: rpmdb/rpmdb.c:3172 msgid "no dbpath has been set" msgstr "nebyla nastavena dbpath" -#: rpmdb/rpmdb.c:3332 +#: rpmdb/rpmdb.c:3199 #, c-format msgid "rebuilding database %s into %s\n" msgstr "databázi %s pøevádím do %s\n" -#: rpmdb/rpmdb.c:3336 +#: rpmdb/rpmdb.c:3203 #, c-format msgid "temporary database %s already exists\n" msgstr "doèasná databáze %s ji¾ existuje\n" -#: rpmdb/rpmdb.c:3342 +#: rpmdb/rpmdb.c:3209 #, c-format msgid "creating directory %s\n" msgstr "vytváøím adresáø %s\n" -#: rpmdb/rpmdb.c:3344 +#: rpmdb/rpmdb.c:3211 #, c-format msgid "creating directory %s: %s\n" msgstr "vytváøím adresáø %s: %s\n" -#: rpmdb/rpmdb.c:3351 +#: rpmdb/rpmdb.c:3218 #, c-format msgid "opening old database with dbapi %d\n" msgstr "otevírám starou databázi s dbapi %d\n" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3229 #, c-format msgid "opening new database with dbapi %d\n" msgstr "otevírám novou databázi s dbapi %d\n" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3253 +#, 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:3293 #, c-format msgid "cannot add record originally at %u\n" msgstr "nemohu pøidat záznam - pùvodnì u %d\n" -#: rpmdb/rpmdb.c:3444 +#: rpmdb/rpmdb.c:3311 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:3452 +#: rpmdb/rpmdb.c:3319 msgid "failed to replace old database with new database!\n" msgstr "starou databázi nelze nahradit novou databází!\n" -#: rpmdb/rpmdb.c:3454 +#: rpmdb/rpmdb.c:3321 #, 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:3464 +#: rpmdb/rpmdb.c:3331 #, c-format msgid "removing directory %s\n" msgstr "ma¾u adresáø %s\n" -#: rpmdb/rpmdb.c:3466 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "nemohu odstranit adresáø %s: %s\n" @@ -3401,6 +3357,33 @@ msgid "failed to create %s: %s\n" msgstr "nemohu vytvoøit %s: %s\n" #~ msgid "" +#~ "Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" +#~ msgstr "" +#~ "Poru¹ený øetìzec v balíèku na offsetu %d(0x%08x), zkou¹ím znovu " +#~ "pøipojit...\n" + +#~ msgid "Reconnecting broken chain at offset %d(0x%08x).\n" +#~ msgstr "Pøipojuji poru¹ený øetìzec na offsetu %d(0x%08x).\n" + +#~ msgid "closed db file %s\n" +#~ msgstr "zavøen db soubor %s\n" + +#~ msgid "removed db file %s\n" +#~ msgstr "odstranìn db soubor %s\n" + +#~ msgid "bad db file %s\n" +#~ msgstr "¹patný db soubor %s\n" + +#~ msgid "opening db file %s mode 0x%x\n" +#~ msgstr "otevírám db soubor %s mode 0x%x\n" + +#~ msgid "cannot get %s lock on database\n" +#~ msgstr "nemohu vytvoøit zámek %s na databázi\n" + +#~ msgid "error(%d) counting packages\n" +#~ msgstr "chyba(%d) pøi poèítání balíèkù\n" + +#~ msgid "" #~ "free list corrupt (%u)- please run\n" #~ "\t\"rpm --rebuilddb\"\n" #~ "More information is available from http://www.rpm.org or the rpm-" diff --git a/po/da.po b/po/da.po index 8dd3880..2951acd 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-02 19:33-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -1510,7 +1510,7 @@ msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 +#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028 msgid "(not a number)" msgstr "(ikke et tal)" @@ -2854,62 +2854,16 @@ msgstr "Ikke-tilfredsstillede afh msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:85 +#: rpmdb/db3.c:85 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "db%d fejl(%d) fra %s: %s\n" -#: rpmdb/db1.c:101 rpmdb/db3.c:88 +#: rpmdb/db3.c:88 #, c-format msgid "db%d error(%d): %s\n" msgstr "db%d fejl(%d): %s\n" -#: rpmdb/db1.c:168 -#, c-format -msgid "" -"Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" -msgstr "" - -#: rpmdb/db1.c:180 -#, c-format -msgid "Reconnecting broken chain at offset %d(0x%08x).\n" -msgstr "" - -#. @=branchstate@ -#: rpmdb/db1.c:506 -#, c-format -msgid "closed db file %s\n" -msgstr "lukket db-fil %s\n" - -#: rpmdb/db1.c:509 -#, c-format -msgid "removed db file %s\n" -msgstr "fjernet db-fil %s\n" - -#: rpmdb/db1.c:544 -#, c-format -msgid "bad db file %s\n" -msgstr "ugyldig db-fil %s\n" - -#: rpmdb/db1.c:549 -#, c-format -msgid "opening db file %s mode 0x%x\n" -msgstr "åbner db-fil %s modus 0x%x\n" - -#. XXX check errno validity -#: rpmdb/db1.c:572 -#, c-format -msgid "cannot get %s lock on database\n" -msgstr "kunne ikke opnå %s lås på database\n" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "exclusive" -msgstr "eksklusiv" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "shared" -msgstr "delt" - #: rpmdb/db3.c:114 #, fuzzy, c-format msgid "closed db environment %s/%s\n" @@ -2925,27 +2879,35 @@ msgstr "fjernede db-milj msgid "opening db environment %s/%s %s\n" msgstr "åbner db-miljø %s/%s %s\n" -#: rpmdb/db3.c:561 +#: rpmdb/db3.c:605 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "lukkede db-indeks %s/%s\n" -#: rpmdb/db3.c:628 +#: rpmdb/db3.c:672 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "lukkede db-indeks %s/%s\n" -#: rpmdb/db3.c:850 +#: rpmdb/db3.c:894 #, 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:1066 +#: rpmdb/db3.c:1110 #, 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:1072 +#: rpmdb/db3.c:1112 +msgid "exclusive" +msgstr "eksklusiv" + +#: rpmdb/db3.c:1112 +msgid "shared" +msgstr "delt" + +#: rpmdb/db3.c:1116 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "låste db-index %s/%s\n" @@ -2977,72 +2939,72 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE-antal skal være 1.\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2208 +#: rpmdb/header.c:2210 msgid "missing { after %" msgstr "manglende { efter %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2238 +#: rpmdb/header.c:2240 msgid "missing } after %{" msgstr "manglende } efter %{" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2254 msgid "empty tag format" msgstr "tomt mærkeformat" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2268 msgid "empty tag name" msgstr "tomt mærkenavn" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2283 +#: rpmdb/header.c:2285 msgid "unknown tag" msgstr "ukendt mærke" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2310 +#: rpmdb/header.c:2312 msgid "] expected at end of array" msgstr "] forventet ved slutningen af tabel" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2330 msgid "unexpected ]" msgstr "uventet ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2332 +#: rpmdb/header.c:2334 msgid "unexpected }" msgstr "uventet }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2398 +#: rpmdb/header.c:2401 msgid "? expected in expression" msgstr "? forventet i udtryk" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2407 +#: rpmdb/header.c:2410 msgid "{ expected after ? in expression" msgstr "{ forventet efter ? i udtryk" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2420 rpmdb/header.c:2462 +#: rpmdb/header.c:2423 rpmdb/header.c:2468 msgid "} expected in expression" msgstr "} forventet i udtryk" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2430 +#: rpmdb/header.c:2433 msgid ": expected following ? subexpression" msgstr ": forventet efter ?-underudtryk" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2447 +#: rpmdb/header.c:2453 msgid "{ expected after : in expression" msgstr "{ forventet efter : i udtryk" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2472 +#: rpmdb/header.c:2478 msgid "| expected at end of expression" msgstr "| forventet ved slutningen af udtryk" @@ -3065,153 +3027,148 @@ msgstr "" "generér hoveder, der er kompatible med (gamle) rpm[23]-indpakningsversioner" #. @-modfilesys@ -#: rpmdb/rpmdb.c:161 +#: rpmdb/rpmdb.c:162 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: ukendt mærkenavn: \"%s\" ignoreret\n" -#: rpmdb/rpmdb.c:254 +#: rpmdb/rpmdb.c:234 #, 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:276 +#: rpmdb/rpmdb.c:256 #, c-format msgid "cannot open %s index\n" msgstr "kan ikke åbne '%s'-indeks\n" -#: rpmdb/rpmdb.c:377 -#, c-format -msgid "error(%d) getting \"%s\" records from %s index\n" -msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n" - -#: rpmdb/rpmdb.c:518 -#, 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:538 -#, 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:797 +#: rpmdb/rpmdb.c:695 msgid "no dbpath has been set\n" msgstr "der er ikke sat nogen dbpath\n" -#. error -#: rpmdb/rpmdb.c:1183 +#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007 +#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787 #, c-format -msgid "error(%d) counting packages\n" -msgstr "fejl(%d) ved optælling af pakker\n" - -#: rpmdb/rpmdb.c:1986 rpmdb/rpmdb.c:3386 -#, fuzzy, c-format -msgid "record number %u in database is bad -- skipping.\n" -msgstr "post nummer %d i databasen er fejlbehæftet -- overspringer.\n" +msgid "error(%d) getting \"%s\" records from %s index\n" +msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n" -#: rpmdb/rpmdb.c:2052 +#: rpmdb/rpmdb.c:1930 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2326 +#: rpmdb/rpmdb.c:2189 #, 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:2495 +#: rpmdb/rpmdb.c:2354 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "fjerner \"%s\" fra %s-indekset.\n" -#: rpmdb/rpmdb.c:2499 +#: rpmdb/rpmdb.c:2358 #, c-format msgid "removing %d entries from %s index.\n" msgstr "fjerne %d indgange fra %s-indekset.\n" -#: rpmdb/rpmdb.c:2692 +#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803 +#, 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:2416 +#, 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:2557 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "fejl(%d) under allokering af ny pakkeinstans\n" -#: rpmdb/rpmdb.c:2887 +#: rpmdb/rpmdb.c:2763 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" "tilføjer \"%s\" til '%s'-indekset.\n" "\n" -#: rpmdb/rpmdb.c:2891 +#: rpmdb/rpmdb.c:2767 #, c-format msgid "adding %d entries to %s index.\n" msgstr "tilføjer %d indgange til '%s'-indekset.\n" -#: rpmdb/rpmdb.c:3272 +#: rpmdb/rpmdb.c:3137 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "fjerner %s efter vellykket genopbygning af db3.\n" -#: rpmdb/rpmdb.c:3305 +#: rpmdb/rpmdb.c:3172 msgid "no dbpath has been set" msgstr "der ikke sat nogen dbpath" -#: rpmdb/rpmdb.c:3332 +#: rpmdb/rpmdb.c:3199 #, c-format msgid "rebuilding database %s into %s\n" msgstr "genopbygger database %s over i %s\n" -#: rpmdb/rpmdb.c:3336 +#: rpmdb/rpmdb.c:3203 #, c-format msgid "temporary database %s already exists\n" msgstr "den midlertidige database %s eksisterer allerede\n" -#: rpmdb/rpmdb.c:3342 +#: rpmdb/rpmdb.c:3209 #, c-format msgid "creating directory %s\n" msgstr "" "opretter kataloget %s\n" "\n" -#: rpmdb/rpmdb.c:3344 +#: rpmdb/rpmdb.c:3211 #, c-format msgid "creating directory %s: %s\n" msgstr "opretter kataloget %s: %s\n" -#: rpmdb/rpmdb.c:3351 +#: rpmdb/rpmdb.c:3218 #, c-format msgid "opening old database with dbapi %d\n" msgstr "åbner gammel database med dbapi %d\n" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3229 #, c-format msgid "opening new database with dbapi %d\n" msgstr "åbner ny database med dbapi %d\n" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3253 +#, 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:3293 #, 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:3444 +#: rpmdb/rpmdb.c:3311 msgid "failed to rebuild database: original database remains in place\n" msgstr "kunne ikke genopbygge database: original-databasen beholdes\n" -#: rpmdb/rpmdb.c:3452 +#: rpmdb/rpmdb.c:3319 msgid "failed to replace old database with new database!\n" msgstr "kunne ikke erstatte gammel database med ny database!\n" -#: rpmdb/rpmdb.c:3454 +#: rpmdb/rpmdb.c:3321 #, 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:3464 +#: rpmdb/rpmdb.c:3331 #, c-format msgid "removing directory %s\n" msgstr "fjerner kataloget %s\n" -#: rpmdb/rpmdb.c:3466 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunne ikke fjerne katalog %s: %s\n" @@ -3423,6 +3380,24 @@ msgstr "url-port skal v msgid "failed to create %s: %s\n" msgstr "kunne ikke oprette %s: %s\n" +#~ msgid "closed db file %s\n" +#~ msgstr "lukket db-fil %s\n" + +#~ msgid "removed db file %s\n" +#~ msgstr "fjernet db-fil %s\n" + +#~ msgid "bad db file %s\n" +#~ msgstr "ugyldig db-fil %s\n" + +#~ msgid "opening db file %s mode 0x%x\n" +#~ msgstr "åbner db-fil %s modus 0x%x\n" + +#~ msgid "cannot get %s lock on database\n" +#~ msgstr "kunne ikke opnå %s lås på database\n" + +#~ msgid "error(%d) counting packages\n" +#~ msgstr "fejl(%d) ved optælling af pakker\n" + #~ msgid "" #~ "free list corrupt (%u)- please run\n" #~ "\t\"rpm --rebuilddb\"\n" diff --git a/po/de.po b/po/de.po index 591fd8f..8aad6fc 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-02 19:33-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -1645,7 +1645,7 @@ msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 +#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028 msgid "(not a number)" msgstr "(keine Zahl)" @@ -3040,63 +3040,16 @@ msgstr "Nicht erf msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:85 +#: rpmdb/db3.c:85 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:88 +#: rpmdb/db3.c:88 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db1.c:168 -#, c-format -msgid "" -"Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" -msgstr "" - -#: rpmdb/db1.c:180 -#, c-format -msgid "Reconnecting broken chain at offset %d(0x%08x).\n" -msgstr "" - -#. @=branchstate@ -#: rpmdb/db1.c:506 -#, c-format -msgid "closed db file %s\n" -msgstr "" - -#: rpmdb/db1.c:509 -#, c-format -msgid "removed db file %s\n" -msgstr "" - -# , c-format -#: rpmdb/db1.c:544 -#, fuzzy, c-format -msgid "bad db file %s\n" -msgstr "Öffnen von %s fehlgeschlagen: %s" - -#: rpmdb/db1.c:549 -#, fuzzy, c-format -msgid "opening db file %s mode 0x%x\n" -msgstr "Datenbank aus der vorhandenen neu erstellen" - -#. XXX check errno validity -#: rpmdb/db1.c:572 -#, fuzzy, c-format -msgid "cannot get %s lock on database\n" -msgstr "kann %s lock für die Datenbank nicht bekommen" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "exclusive" -msgstr "exklusiv" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "shared" -msgstr "geteilt" - #: rpmdb/db3.c:114 #, c-format msgid "closed db environment %s/%s\n" @@ -3112,27 +3065,35 @@ msgstr "" msgid "opening db environment %s/%s %s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/db3.c:561 +#: rpmdb/db3.c:605 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/db3.c:628 +#: rpmdb/db3.c:672 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/db3.c:850 +#: rpmdb/db3.c:894 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/db3.c:1066 +#: rpmdb/db3.c:1110 #, 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:1072 +#: rpmdb/db3.c:1112 +msgid "exclusive" +msgstr "exklusiv" + +#: rpmdb/db3.c:1112 +msgid "shared" +msgstr "geteilt" + +#: rpmdb/db3.c:1116 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" @@ -3164,75 +3125,75 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2208 +#: rpmdb/header.c:2210 msgid "missing { after %" msgstr "fehlende { nach %{" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2238 +#: rpmdb/header.c:2240 msgid "missing } after %{" msgstr "fehlende } nach %{" # »Tag« übersetzen??? -ke- #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2254 msgid "empty tag format" msgstr "leeres »Tag«-Format" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2268 msgid "empty tag name" msgstr "leerer »Tag«-Name" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2283 +#: rpmdb/header.c:2285 msgid "unknown tag" msgstr "unbekannter »Tag«" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2310 +#: rpmdb/header.c:2312 msgid "] expected at end of array" msgstr "] am Ende des Arrays erwartet" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2330 msgid "unexpected ]" msgstr "unerwartete ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2332 +#: rpmdb/header.c:2334 msgid "unexpected }" msgstr "unerwartete }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2398 +#: rpmdb/header.c:2401 msgid "? expected in expression" msgstr "? im Ausdruck erwartet" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2407 +#: rpmdb/header.c:2410 #, fuzzy msgid "{ expected after ? in expression" msgstr "{ nach ? im Ausdruck erwartet" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2420 rpmdb/header.c:2462 +#: rpmdb/header.c:2423 rpmdb/header.c:2468 msgid "} expected in expression" msgstr "} im Ausdruck erwartet" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2430 +#: rpmdb/header.c:2433 msgid ": expected following ? subexpression" msgstr ": nach ? Unterausdruck erwartet" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2447 +#: rpmdb/header.c:2453 #, fuzzy msgid "{ expected after : in expression" msgstr "{ nach : im Ausdruck erwartet" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2472 +#: rpmdb/header.c:2478 msgid "| expected at end of expression" msgstr "| am Ende des Ausdrucks erwartet" @@ -3255,156 +3216,151 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:161 +#: rpmdb/rpmdb.c:162 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:254 +#: rpmdb/rpmdb.c:234 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "kann Datei %s nicht öffnen: " -#: rpmdb/rpmdb.c:276 +#: rpmdb/rpmdb.c:256 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: rpmdb/rpmdb.c:377 -#, fuzzy, c-format -msgid "error(%d) getting \"%s\" records from %s index\n" -msgstr "Fehler beim Eintrag %s von %s" - -#: rpmdb/rpmdb.c:518 -#, 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:538 -#, 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:797 +#: rpmdb/rpmdb.c:695 #, fuzzy msgid "no dbpath has been set\n" msgstr "»dbpath« ist nicht gesetzt" -#. error -#: rpmdb/rpmdb.c:1183 +#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007 +#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787 #, fuzzy, c-format -msgid "error(%d) counting packages\n" -msgstr "Fehler beim Suchen nach Paket %s\n" - -#: rpmdb/rpmdb.c:1986 rpmdb/rpmdb.c:3386 -#, 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" +msgid "error(%d) getting \"%s\" records from %s index\n" +msgstr "Fehler beim Eintrag %s von %s" -#: rpmdb/rpmdb.c:2052 +#: rpmdb/rpmdb.c:1930 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2326 +#: rpmdb/rpmdb.c:2189 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen" # FIXME -#: rpmdb/rpmdb.c:2495 +#: rpmdb/rpmdb.c:2354 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" # FIXME -#: rpmdb/rpmdb.c:2499 +#: rpmdb/rpmdb.c:2358 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:2692 +#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803 +#, 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:2416 +#, 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:2557 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "Fehler beim Suchen nach Paket %s\n" -#: rpmdb/rpmdb.c:2887 +#: rpmdb/rpmdb.c:2763 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" # FIXME -#: rpmdb/rpmdb.c:2891 +#: rpmdb/rpmdb.c:2767 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:3272 +#: rpmdb/rpmdb.c:3137 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3305 +#: rpmdb/rpmdb.c:3172 msgid "no dbpath has been set" msgstr "»dbpath« ist nicht gesetzt" -#: rpmdb/rpmdb.c:3332 +#: rpmdb/rpmdb.c:3199 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3336 +#: rpmdb/rpmdb.c:3203 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "die temporäre Datenbank %s existiert schon" -#: rpmdb/rpmdb.c:3342 +#: rpmdb/rpmdb.c:3209 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: rpmdb/rpmdb.c:3344 +#: rpmdb/rpmdb.c:3211 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: rpmdb/rpmdb.c:3351 +#: rpmdb/rpmdb.c:3218 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3229 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3253 +#, 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:3293 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d" -#: rpmdb/rpmdb.c:3444 +#: rpmdb/rpmdb.c:3311 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3452 +#: rpmdb/rpmdb.c:3319 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3454 +#: rpmdb/rpmdb.c:3321 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3464 +#: rpmdb/rpmdb.c:3331 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" # , c-format -#: rpmdb/rpmdb.c:3466 +#: rpmdb/rpmdb.c:3333 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" @@ -3629,6 +3585,23 @@ msgstr "Fehler: der FTP-Port muss eine Zahl sein\n" msgid "failed to create %s: %s\n" msgstr "anlegen von %s fehlgeschlagen\n" +# , c-format +#, fuzzy +#~ msgid "bad db file %s\n" +#~ msgstr "Öffnen von %s fehlgeschlagen: %s" + +#, fuzzy +#~ msgid "opening db file %s mode 0x%x\n" +#~ msgstr "Datenbank aus der vorhandenen neu erstellen" + +#, fuzzy +#~ msgid "cannot get %s lock on database\n" +#~ msgstr "kann %s lock für die Datenbank nicht bekommen" + +#, fuzzy +#~ msgid "error(%d) counting packages\n" +#~ msgstr "Fehler beim Suchen nach Paket %s\n" + #, fuzzy #~ msgid "don't verify signature(s)" #~ msgstr "Paket installieren" diff --git a/po/fi.po b/po/fi.po index d69ee4f..9f68563 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-02 19:33-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -1535,7 +1535,7 @@ msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 +#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028 msgid "(not a number)" msgstr "(ei ole luku)" @@ -2908,62 +2908,16 @@ msgstr "%s-%s-%s:n tyydytt msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:85 +#: rpmdb/db3.c:85 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:88 +#: rpmdb/db3.c:88 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db1.c:168 -#, c-format -msgid "" -"Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" -msgstr "" - -#: rpmdb/db1.c:180 -#, c-format -msgid "Reconnecting broken chain at offset %d(0x%08x).\n" -msgstr "" - -#. @=branchstate@ -#: rpmdb/db1.c:506 -#, c-format -msgid "closed db file %s\n" -msgstr "" - -#: rpmdb/db1.c:509 -#, c-format -msgid "removed db file %s\n" -msgstr "" - -#: rpmdb/db1.c:544 -#, fuzzy, c-format -msgid "bad db file %s\n" -msgstr "en voinut avata %s: %s" - -#: rpmdb/db1.c:549 -#, fuzzy, c-format -msgid "opening db file %s mode 0x%x\n" -msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" - -#. XXX check errno validity -#: rpmdb/db1.c:572 -#, fuzzy, c-format -msgid "cannot get %s lock on database\n" -msgstr "en voi saada %s lukitusta tietokantaan" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "exclusive" -msgstr "poissulkevaa" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "shared" -msgstr "jaettua" - #: rpmdb/db3.c:114 #, c-format msgid "closed db environment %s/%s\n" @@ -2979,27 +2933,35 @@ msgstr "" msgid "opening db environment %s/%s %s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/db3.c:561 +#: rpmdb/db3.c:605 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/db3.c:628 +#: rpmdb/db3.c:672 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/db3.c:850 +#: rpmdb/db3.c:894 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/db3.c:1066 +#: rpmdb/db3.c:1110 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "en voi saada %s lukitusta tietokantaan" -#: rpmdb/db3.c:1072 +#: rpmdb/db3.c:1112 +msgid "exclusive" +msgstr "poissulkevaa" + +#: rpmdb/db3.c:1112 +msgid "shared" +msgstr "jaettua" + +#: rpmdb/db3.c:1116 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" @@ -3031,74 +2993,74 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2208 +#: rpmdb/header.c:2210 msgid "missing { after %" msgstr "puuttuva '{' '%':n jälkeen" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2238 +#: rpmdb/header.c:2240 msgid "missing } after %{" msgstr "puuttuva '{' '%{':n jälkeen" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2254 msgid "empty tag format" msgstr "tyhjä nimiön formaatti" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2268 msgid "empty tag name" msgstr "tyhjä nimiön nimi" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2283 +#: rpmdb/header.c:2285 msgid "unknown tag" msgstr "tuntematon nimiö" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2310 +#: rpmdb/header.c:2312 msgid "] expected at end of array" msgstr "']' puuttuu taulukkomäärittelyn lopusta" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2330 msgid "unexpected ]" msgstr "odottamaton ']'" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2332 +#: rpmdb/header.c:2334 msgid "unexpected }" msgstr "odottamaton '}'" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2398 +#: rpmdb/header.c:2401 msgid "? expected in expression" msgstr "odotin '?'-merkkiä ilmauksessa" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2407 +#: rpmdb/header.c:2410 #, fuzzy msgid "{ expected after ? in expression" msgstr "odotin '{' '?'-merkin jälkeen ilmauksessa " #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2420 rpmdb/header.c:2462 +#: rpmdb/header.c:2423 rpmdb/header.c:2468 msgid "} expected in expression" msgstr "odotin '}'-merkkiä ilmauksessa" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2430 +#: rpmdb/header.c:2433 msgid ": expected following ? subexpression" msgstr "odotin ':' '?'-merkin jälkeen ali-ilmauksessa " #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2447 +#: rpmdb/header.c:2453 #, fuzzy msgid "{ expected after : in expression" msgstr "odotin '{' ':'-merkin jälkeen ilmauksessa " #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2472 +#: rpmdb/header.c:2478 msgid "| expected at end of expression" msgstr "odotin '}'-merkkiä ilmauksen lopussa" @@ -3121,150 +3083,145 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:161 +#: rpmdb/rpmdb.c:162 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:254 +#: rpmdb/rpmdb.c:234 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "en voinut avata tiedostoa %s: " -#: rpmdb/rpmdb.c:276 +#: rpmdb/rpmdb.c:256 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "virhe: en voi avata %s\n" -#: rpmdb/rpmdb.c:377 -#, fuzzy, c-format -msgid "error(%d) getting \"%s\" records from %s index\n" -msgstr "virhe luettaessa tietuetta %s %s:stä" - -#: rpmdb/rpmdb.c:518 -#, fuzzy, c-format -msgid "error(%d) storing record %s into %s\n" -msgstr "virhe talletettaessa tietuetta %s %s:ään" - -#: rpmdb/rpmdb.c:538 -#, fuzzy, c-format -msgid "error(%d) removing record %s from %s\n" -msgstr "virhe poistettaessa tietuetta %s %s:stä" - -#: rpmdb/rpmdb.c:797 +#: rpmdb/rpmdb.c:695 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath ei ole asetettu" -#. error -#: rpmdb/rpmdb.c:1183 +#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007 +#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787 #, fuzzy, c-format -msgid "error(%d) counting packages\n" -msgstr "virhe etsittäessä pakettia %s\n" - -#: rpmdb/rpmdb.c:1986 rpmdb/rpmdb.c:3386 -#, fuzzy, c-format -msgid "record number %u in database is bad -- skipping.\n" -msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen" +msgid "error(%d) getting \"%s\" records from %s index\n" +msgstr "virhe luettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2052 +#: rpmdb/rpmdb.c:1930 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2326 +#: rpmdb/rpmdb.c:2189 #, 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:2495 +#: rpmdb/rpmdb.c:2354 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2499 +#: rpmdb/rpmdb.c:2358 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2692 +#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803 +#, fuzzy, c-format +msgid "error(%d) storing record %s into %s\n" +msgstr "virhe talletettaessa tietuetta %s %s:ään" + +#: rpmdb/rpmdb.c:2416 +#, fuzzy, c-format +msgid "error(%d) removing record %s from %s\n" +msgstr "virhe poistettaessa tietuetta %s %s:stä" + +#: rpmdb/rpmdb.c:2557 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "virhe etsittäessä pakettia %s\n" -#: rpmdb/rpmdb.c:2887 +#: rpmdb/rpmdb.c:2763 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2891 +#: rpmdb/rpmdb.c:2767 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:3272 +#: rpmdb/rpmdb.c:3137 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3305 +#: rpmdb/rpmdb.c:3172 msgid "no dbpath has been set" msgstr "dbpath ei ole asetettu" -#: rpmdb/rpmdb.c:3332 +#: rpmdb/rpmdb.c:3199 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3336 +#: rpmdb/rpmdb.c:3203 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "väliaikainen tietokanta %s on jo olemassa" -#: rpmdb/rpmdb.c:3342 +#: rpmdb/rpmdb.c:3209 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3344 +#: rpmdb/rpmdb.c:3211 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3351 +#: rpmdb/rpmdb.c:3218 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3229 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3253 +#, fuzzy, c-format +msgid "record number %u in database is bad -- skipping.\n" +msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen" + +#: rpmdb/rpmdb.c:3293 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "en voi lisätä tietuetta %d:stä" -#: rpmdb/rpmdb.c:3444 +#: rpmdb/rpmdb.c:3311 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3452 +#: rpmdb/rpmdb.c:3319 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3454 +#: rpmdb/rpmdb.c:3321 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3464 +#: rpmdb/rpmdb.c:3331 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3466 +#: rpmdb/rpmdb.c:3333 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "en voinut avata %s: %s" @@ -3488,6 +3445,22 @@ msgid "failed to create %s: %s\n" msgstr "%s:n luonti epäonnistui\n" #, fuzzy +#~ msgid "bad db file %s\n" +#~ msgstr "en voinut avata %s: %s" + +#, fuzzy +#~ msgid "opening db file %s mode 0x%x\n" +#~ msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" + +#, fuzzy +#~ msgid "cannot get %s lock on database\n" +#~ msgstr "en voi saada %s lukitusta tietokantaan" + +#, fuzzy +#~ msgid "error(%d) counting packages\n" +#~ msgstr "virhe etsittäessä pakettia %s\n" + +#, fuzzy #~ msgid "don't verify signature(s)" #~ msgstr "asenna paketti" diff --git a/po/fr.po b/po/fr.po index 686ca4c..32f1599 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-02 19:33-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1563,7 +1563,7 @@ msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 +#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028 msgid "(not a number)" msgstr "" @@ -2939,62 +2939,16 @@ msgstr "impossible d'ouvrir: %s\n" msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:85 +#: rpmdb/db3.c:85 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:88 +#: rpmdb/db3.c:88 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db1.c:168 -#, c-format -msgid "" -"Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" -msgstr "" - -#: rpmdb/db1.c:180 -#, c-format -msgid "Reconnecting broken chain at offset %d(0x%08x).\n" -msgstr "" - -#. @=branchstate@ -#: rpmdb/db1.c:506 -#, c-format -msgid "closed db file %s\n" -msgstr "" - -#: rpmdb/db1.c:509 -#, c-format -msgid "removed db file %s\n" -msgstr "" - -#: rpmdb/db1.c:544 -#, fuzzy, c-format -msgid "bad db file %s\n" -msgstr "impossible d'ouvrir: %s\n" - -#: rpmdb/db1.c:549 -#, fuzzy, c-format -msgid "opening db file %s mode 0x%x\n" -msgstr "impossible d'ouvrir: %s\n" - -#. XXX check errno validity -#: rpmdb/db1.c:572 -#, fuzzy, c-format -msgid "cannot get %s lock on database\n" -msgstr "aucun package n'a t spcifi pour la dsinstallation" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "exclusive" -msgstr "" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "shared" -msgstr "" - #: rpmdb/db3.c:114 #, c-format msgid "closed db environment %s/%s\n" @@ -3010,27 +2964,35 @@ msgstr "" msgid "opening db environment %s/%s %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/db3.c:561 +#: rpmdb/db3.c:605 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/db3.c:628 +#: rpmdb/db3.c:672 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/db3.c:850 +#: rpmdb/db3.c:894 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/db3.c:1066 +#: rpmdb/db3.c:1110 #, 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:1072 +#: rpmdb/db3.c:1112 +msgid "exclusive" +msgstr "" + +#: rpmdb/db3.c:1112 +msgid "shared" +msgstr "" + +#: rpmdb/db3.c:1116 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "impossible d'ouvrir: %s\n" @@ -3062,74 +3024,74 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2208 +#: rpmdb/header.c:2210 msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2238 +#: rpmdb/header.c:2240 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2254 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2268 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2283 +#: rpmdb/header.c:2285 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2310 +#: rpmdb/header.c:2312 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2330 #, fuzzy msgid "unexpected ]" msgstr "source de requte inattendue" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2332 +#: rpmdb/header.c:2334 #, fuzzy msgid "unexpected }" msgstr "source de requte inattendue" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2398 +#: rpmdb/header.c:2401 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2407 +#: rpmdb/header.c:2410 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2420 rpmdb/header.c:2462 +#: rpmdb/header.c:2423 rpmdb/header.c:2468 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2430 +#: rpmdb/header.c:2433 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2447 +#: rpmdb/header.c:2453 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2472 +#: rpmdb/header.c:2478 msgid "| expected at end of expression" msgstr "" @@ -3152,149 +3114,144 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:161 +#: rpmdb/rpmdb.c:162 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:254 +#: rpmdb/rpmdb.c:234 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:276 +#: rpmdb/rpmdb.c:256 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:377 -#, fuzzy, c-format -msgid "error(%d) getting \"%s\" records from %s index\n" -msgstr "impossible d'ouvrir: %s\n" - -#: rpmdb/rpmdb.c:518 -#, fuzzy, c-format -msgid "error(%d) storing record %s into %s\n" -msgstr "impossible d'ouvrir: %s\n" - -#: rpmdb/rpmdb.c:538 -#, fuzzy, c-format -msgid "error(%d) removing record %s from %s\n" -msgstr "impossible d'ouvrir: %s\n" - -#: rpmdb/rpmdb.c:797 +#: rpmdb/rpmdb.c:695 msgid "no dbpath has been set\n" msgstr "" -#. error -#: rpmdb/rpmdb.c:1183 +#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007 +#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787 #, fuzzy, c-format -msgid "error(%d) counting packages\n" -msgstr "aucun package n'a t spcifi pour l'installation" - -#: rpmdb/rpmdb.c:1986 rpmdb/rpmdb.c:3386 -#, c-format -msgid "record number %u in database is bad -- skipping.\n" -msgstr "" +msgid "error(%d) getting \"%s\" records from %s index\n" +msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2052 +#: rpmdb/rpmdb.c:1930 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2326 +#: rpmdb/rpmdb.c:2189 #, 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:2495 +#: rpmdb/rpmdb.c:2354 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2499 +#: rpmdb/rpmdb.c:2358 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2692 +#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803 +#, fuzzy, c-format +msgid "error(%d) storing record %s into %s\n" +msgstr "impossible d'ouvrir: %s\n" + +#: rpmdb/rpmdb.c:2416 +#, fuzzy, c-format +msgid "error(%d) removing record %s from %s\n" +msgstr "impossible d'ouvrir: %s\n" + +#: rpmdb/rpmdb.c:2557 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: rpmdb/rpmdb.c:2887 +#: rpmdb/rpmdb.c:2763 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2891 +#: rpmdb/rpmdb.c:2767 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3272 +#: rpmdb/rpmdb.c:3137 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3305 +#: rpmdb/rpmdb.c:3172 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3332 +#: rpmdb/rpmdb.c:3199 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3336 +#: rpmdb/rpmdb.c:3203 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3342 +#: rpmdb/rpmdb.c:3209 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3344 +#: rpmdb/rpmdb.c:3211 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3351 +#: rpmdb/rpmdb.c:3218 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3229 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3253 +#, c-format +msgid "record number %u in database is bad -- skipping.\n" +msgstr "" + +#: rpmdb/rpmdb.c:3293 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3444 +#: rpmdb/rpmdb.c:3311 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3452 +#: rpmdb/rpmdb.c:3319 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3454 +#: rpmdb/rpmdb.c:3321 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3464 +#: rpmdb/rpmdb.c:3331 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3466 +#: rpmdb/rpmdb.c:3333 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -3507,6 +3464,22 @@ msgid "failed to create %s: %s\n" msgstr "impossible d'ouvrir: %s\n" #, fuzzy +#~ msgid "bad db file %s\n" +#~ msgstr "impossible d'ouvrir: %s\n" + +#, fuzzy +#~ msgid "opening db file %s mode 0x%x\n" +#~ msgstr "impossible d'ouvrir: %s\n" + +#, fuzzy +#~ msgid "cannot get %s lock on database\n" +#~ msgstr "aucun package n'a t spcifi pour la dsinstallation" + +#, fuzzy +#~ msgid "error(%d) counting packages\n" +#~ msgstr "aucun package n'a t spcifi pour l'installation" + +#, fuzzy #~ msgid "don't verify signature(s)" #~ msgstr "" #~ " -f + - interroge le package qui appartient " diff --git a/po/gl.po b/po/gl.po index 7ea8ff0..823f7dc 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-02 19:33-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -1474,7 +1474,7 @@ msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 +#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028 msgid "(not a number)" msgstr "" @@ -2763,62 +2763,16 @@ msgstr "" msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:85 +#: rpmdb/db3.c:85 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:88 +#: rpmdb/db3.c:88 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db1.c:168 -#, c-format -msgid "" -"Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" -msgstr "" - -#: rpmdb/db1.c:180 -#, c-format -msgid "Reconnecting broken chain at offset %d(0x%08x).\n" -msgstr "" - -#. @=branchstate@ -#: rpmdb/db1.c:506 -#, c-format -msgid "closed db file %s\n" -msgstr "" - -#: rpmdb/db1.c:509 -#, c-format -msgid "removed db file %s\n" -msgstr "" - -#: rpmdb/db1.c:544 -#, c-format -msgid "bad db file %s\n" -msgstr "" - -#: rpmdb/db1.c:549 -#, c-format -msgid "opening db file %s mode 0x%x\n" -msgstr "" - -#. XXX check errno validity -#: rpmdb/db1.c:572 -#, c-format -msgid "cannot get %s lock on database\n" -msgstr "" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "exclusive" -msgstr "" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "shared" -msgstr "" - #: rpmdb/db3.c:114 #, c-format msgid "closed db environment %s/%s\n" @@ -2834,27 +2788,35 @@ msgstr "" msgid "opening db environment %s/%s %s\n" msgstr "" -#: rpmdb/db3.c:561 +#: rpmdb/db3.c:605 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:628 +#: rpmdb/db3.c:672 #, c-format msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:850 +#: rpmdb/db3.c:894 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1066 +#: rpmdb/db3.c:1110 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1072 +#: rpmdb/db3.c:1112 +msgid "exclusive" +msgstr "" + +#: rpmdb/db3.c:1112 +msgid "shared" +msgstr "" + +#: rpmdb/db3.c:1116 #, c-format msgid "locked db index %s/%s\n" msgstr "" @@ -2886,72 +2848,72 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2208 +#: rpmdb/header.c:2210 msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2238 +#: rpmdb/header.c:2240 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2254 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2268 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2283 +#: rpmdb/header.c:2285 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2310 +#: rpmdb/header.c:2312 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2330 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2332 +#: rpmdb/header.c:2334 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2398 +#: rpmdb/header.c:2401 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2407 +#: rpmdb/header.c:2410 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2420 rpmdb/header.c:2462 +#: rpmdb/header.c:2423 rpmdb/header.c:2468 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2430 +#: rpmdb/header.c:2433 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2447 +#: rpmdb/header.c:2453 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2472 +#: rpmdb/header.c:2478 msgid "| expected at end of expression" msgstr "" @@ -2972,149 +2934,144 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:161 +#: rpmdb/rpmdb.c:162 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:254 +#: rpmdb/rpmdb.c:234 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:276 +#: rpmdb/rpmdb.c:256 #, c-format msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:377 -#, c-format -msgid "error(%d) getting \"%s\" records from %s index\n" -msgstr "" - -#: rpmdb/rpmdb.c:518 -#, c-format -msgid "error(%d) storing record %s into %s\n" +#: rpmdb/rpmdb.c:695 +msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:538 +#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007 +#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787 #, c-format -msgid "error(%d) removing record %s from %s\n" -msgstr "" - -#: rpmdb/rpmdb.c:797 -msgid "no dbpath has been set\n" +msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#. error -#: rpmdb/rpmdb.c:1183 +#: rpmdb/rpmdb.c:1930 #, c-format -msgid "error(%d) counting packages\n" +msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:1986 rpmdb/rpmdb.c:3386 +#: rpmdb/rpmdb.c:2189 #, c-format -msgid "record number %u in database is bad -- skipping.\n" +msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2052 +#: rpmdb/rpmdb.c:2354 #, c-format -msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" +msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2326 +#: rpmdb/rpmdb.c:2358 #, c-format -msgid "%s: cannot read header at 0x%x\n" +msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2495 +#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803 #, c-format -msgid "removing \"%s\" from %s index.\n" +msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2499 +#: rpmdb/rpmdb.c:2416 #, c-format -msgid "removing %d entries from %s index.\n" +msgid "error(%d) removing record %s from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2692 +#: rpmdb/rpmdb.c:2557 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2887 +#: rpmdb/rpmdb.c:2763 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2891 +#: rpmdb/rpmdb.c:2767 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3272 +#: rpmdb/rpmdb.c:3137 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3305 +#: rpmdb/rpmdb.c:3172 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3332 +#: rpmdb/rpmdb.c:3199 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3336 +#: rpmdb/rpmdb.c:3203 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3342 +#: rpmdb/rpmdb.c:3209 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3344 +#: rpmdb/rpmdb.c:3211 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3351 +#: rpmdb/rpmdb.c:3218 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3229 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3253 +#, c-format +msgid "record number %u in database is bad -- skipping.\n" +msgstr "" + +#: rpmdb/rpmdb.c:3293 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3444 +#: rpmdb/rpmdb.c:3311 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3452 +#: rpmdb/rpmdb.c:3319 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3454 +#: rpmdb/rpmdb.c:3321 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3464 +#: rpmdb/rpmdb.c:3331 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3466 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/is.po b/po/is.po index 018f0c2..bd34a06 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-02 19:33-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -1482,7 +1482,7 @@ msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 +#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028 msgid "(not a number)" msgstr "" @@ -2782,62 +2782,16 @@ msgstr " msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:85 +#: rpmdb/db3.c:85 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:88 +#: rpmdb/db3.c:88 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db1.c:168 -#, c-format -msgid "" -"Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" -msgstr "" - -#: rpmdb/db1.c:180 -#, c-format -msgid "Reconnecting broken chain at offset %d(0x%08x).\n" -msgstr "" - -#. @=branchstate@ -#: rpmdb/db1.c:506 -#, c-format -msgid "closed db file %s\n" -msgstr "" - -#: rpmdb/db1.c:509 -#, c-format -msgid "removed db file %s\n" -msgstr "" - -#: rpmdb/db1.c:544 -#, c-format -msgid "bad db file %s\n" -msgstr "" - -#: rpmdb/db1.c:549 -#, c-format -msgid "opening db file %s mode 0x%x\n" -msgstr "" - -#. XXX check errno validity -#: rpmdb/db1.c:572 -#, c-format -msgid "cannot get %s lock on database\n" -msgstr "get ekki fengið %s lás á gagnagrunninn\n" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "exclusive" -msgstr "einka" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "shared" -msgstr "deildann" - #: rpmdb/db3.c:114 #, c-format msgid "closed db environment %s/%s\n" @@ -2853,27 +2807,35 @@ msgstr "fjarl msgid "opening db environment %s/%s %s\n" msgstr "opna gagnagrunnsumhverfi %s/%s %s\n" -#: rpmdb/db3.c:561 +#: rpmdb/db3.c:605 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:628 +#: rpmdb/db3.c:672 #, c-format msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:850 +#: rpmdb/db3.c:894 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1066 +#: rpmdb/db3.c:1110 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1072 +#: rpmdb/db3.c:1112 +msgid "exclusive" +msgstr "einka" + +#: rpmdb/db3.c:1112 +msgid "shared" +msgstr "deildann" + +#: rpmdb/db3.c:1116 #, c-format msgid "locked db index %s/%s\n" msgstr "" @@ -2905,72 +2867,72 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2208 +#: rpmdb/header.c:2210 msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2238 +#: rpmdb/header.c:2240 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2254 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2268 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2283 +#: rpmdb/header.c:2285 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2310 +#: rpmdb/header.c:2312 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2330 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2332 +#: rpmdb/header.c:2334 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2398 +#: rpmdb/header.c:2401 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2407 +#: rpmdb/header.c:2410 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2420 rpmdb/header.c:2462 +#: rpmdb/header.c:2423 rpmdb/header.c:2468 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2430 +#: rpmdb/header.c:2433 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2447 +#: rpmdb/header.c:2453 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2472 +#: rpmdb/header.c:2478 msgid "| expected at end of expression" msgstr "" @@ -2991,149 +2953,144 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:161 +#: rpmdb/rpmdb.c:162 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:254 +#: rpmdb/rpmdb.c:234 #, 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:276 +#: rpmdb/rpmdb.c:256 #, c-format msgid "cannot open %s index\n" msgstr "get ekki opnað %s index\n" -#: rpmdb/rpmdb.c:377 -#, c-format -msgid "error(%d) getting \"%s\" records from %s index\n" -msgstr "" - -#: rpmdb/rpmdb.c:518 -#, c-format -msgid "error(%d) storing record %s into %s\n" +#: rpmdb/rpmdb.c:695 +msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:538 +#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007 +#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787 #, c-format -msgid "error(%d) removing record %s from %s\n" -msgstr "" - -#: rpmdb/rpmdb.c:797 -msgid "no dbpath has been set\n" +msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#. error -#: rpmdb/rpmdb.c:1183 +#: rpmdb/rpmdb.c:1930 #, c-format -msgid "error(%d) counting packages\n" +msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:1986 rpmdb/rpmdb.c:3386 +#: rpmdb/rpmdb.c:2189 #, c-format -msgid "record number %u in database is bad -- skipping.\n" +msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2052 +#: rpmdb/rpmdb.c:2354 #, c-format -msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" +msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2326 +#: rpmdb/rpmdb.c:2358 #, c-format -msgid "%s: cannot read header at 0x%x\n" +msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2495 +#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803 #, c-format -msgid "removing \"%s\" from %s index.\n" +msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2499 +#: rpmdb/rpmdb.c:2416 #, c-format -msgid "removing %d entries from %s index.\n" +msgid "error(%d) removing record %s from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2692 +#: rpmdb/rpmdb.c:2557 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2887 +#: rpmdb/rpmdb.c:2763 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2891 +#: rpmdb/rpmdb.c:2767 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3272 +#: rpmdb/rpmdb.c:3137 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3305 +#: rpmdb/rpmdb.c:3172 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3332 +#: rpmdb/rpmdb.c:3199 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3336 +#: rpmdb/rpmdb.c:3203 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3342 +#: rpmdb/rpmdb.c:3209 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3344 +#: rpmdb/rpmdb.c:3211 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3351 +#: rpmdb/rpmdb.c:3218 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3229 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3253 +#, c-format +msgid "record number %u in database is bad -- skipping.\n" +msgstr "" + +#: rpmdb/rpmdb.c:3293 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3444 +#: rpmdb/rpmdb.c:3311 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3452 +#: rpmdb/rpmdb.c:3319 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3454 +#: rpmdb/rpmdb.c:3321 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3464 +#: rpmdb/rpmdb.c:3331 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3466 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -3345,6 +3302,9 @@ msgstr "g msgid "failed to create %s: %s\n" msgstr "gat ekki búið til %s: %s\n" +#~ msgid "cannot get %s lock on database\n" +#~ msgstr "get ekki fengið %s lás á gagnagrunninn\n" + #, fuzzy #~ msgid "don't verify signature(s)" #~ msgstr "ekki yfirfara symlink slóð skráa" diff --git a/po/ja.po b/po/ja.po index e4af2a9..d57af5e 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-02 19:33-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -1558,7 +1558,7 @@ msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 +#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028 msgid "(not a number)" msgstr "(¿ô»ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)" @@ -2953,62 +2953,16 @@ msgstr "%s-%s-%s msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:85 +#: rpmdb/db3.c:85 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:88 +#: rpmdb/db3.c:88 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db1.c:168 -#, c-format -msgid "" -"Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" -msgstr "" - -#: rpmdb/db1.c:180 -#, c-format -msgid "Reconnecting broken chain at offset %d(0x%08x).\n" -msgstr "" - -#. @=branchstate@ -#: rpmdb/db1.c:506 -#, c-format -msgid "closed db file %s\n" -msgstr "" - -#: rpmdb/db1.c:509 -#, fuzzy, c-format -msgid "removed db file %s\n" -msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" - -#: rpmdb/db1.c:544 -#, fuzzy, c-format -msgid "bad db file %s\n" -msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" - -#: rpmdb/db1.c:549 -#, fuzzy, c-format -msgid "opening db file %s mode 0x%x\n" -msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n" - -#. XXX check errno validity -#: rpmdb/db1.c:572 -#, fuzzy, c-format -msgid "cannot get %s lock on database\n" -msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "exclusive" -msgstr "½ü³°" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "shared" -msgstr "¶¦Í­" - #: rpmdb/db3.c:114 #, fuzzy, c-format msgid "closed db environment %s/%s\n" @@ -3024,27 +2978,35 @@ msgstr "%s msgid "opening db environment %s/%s %s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/db3.c:561 +#: rpmdb/db3.c:605 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/db3.c:628 +#: rpmdb/db3.c:672 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/db3.c:850 +#: rpmdb/db3.c:894 #, fuzzy, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n" -#: rpmdb/db3.c:1066 +#: rpmdb/db3.c:1110 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó" -#: rpmdb/db3.c:1072 +#: rpmdb/db3.c:1112 +msgid "exclusive" +msgstr "½ü³°" + +#: rpmdb/db3.c:1112 +msgid "shared" +msgstr "¶¦Í­" + +#: rpmdb/db3.c:1116 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" @@ -3077,72 +3039,72 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabDate() RPM_STRING_TYPE ¥«¥¦¥ó¥È¤Ï 1 ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2208 +#: rpmdb/header.c:2210 msgid "missing { after %" msgstr "% ¤Î¸å¤Ë { ¤¬¤¢¤ê¤Þ¤»¤ó" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2238 +#: rpmdb/header.c:2240 msgid "missing } after %{" msgstr "%{ ¤Î¸å¤Ë } ¤¬¤¢¤ê¤Þ¤»¤ó" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2254 msgid "empty tag format" msgstr "¶õ¤Î¥¿¥°¥Õ¥©¡¼¥Þ¥Ã¥È" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2268 msgid "empty tag name" msgstr "¶õ¤Î¥¿¥°Ì¾" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2283 +#: rpmdb/header.c:2285 msgid "unknown tag" msgstr "ÉÔÌÀ¤Ê¥¿¥°" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2310 +#: rpmdb/header.c:2312 msgid "] expected at end of array" msgstr "ÇÛÎó¤Î¸å¤Ë ] ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2330 msgid "unexpected ]" msgstr "ͽ´ü¤»¤Ì ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2332 +#: rpmdb/header.c:2334 msgid "unexpected }" msgstr "ͽ´ü¤»¤Ì }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2398 +#: rpmdb/header.c:2401 msgid "? expected in expression" msgstr "¼°Ãæ¤Ç ? ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2407 +#: rpmdb/header.c:2410 msgid "{ expected after ? in expression" msgstr "¼°Ãæ¤Ç ? ¤Î¸å¤Ë { ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2420 rpmdb/header.c:2462 +#: rpmdb/header.c:2423 rpmdb/header.c:2468 msgid "} expected in expression" msgstr "¼°Ãæ¤Ë } ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2430 +#: rpmdb/header.c:2433 msgid ": expected following ? subexpression" msgstr "°Ê²¼¤Î ? ¥µ¥Ö¼°¤Î ¤Ë: ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2447 +#: rpmdb/header.c:2453 msgid "{ expected after : in expression" msgstr "¼°Ãæ¤Ç : ¤Î¸å¤Ë { ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2472 +#: rpmdb/header.c:2478 msgid "| expected at end of expression" msgstr "¼°¤Î½ª¤ê¤Ë | ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" @@ -3165,152 +3127,147 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:161 +#: rpmdb/rpmdb.c:162 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:254 +#: rpmdb/rpmdb.c:234 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó %s:%d" -#: rpmdb/rpmdb.c:276 +#: rpmdb/rpmdb.c:256 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n" -#: rpmdb/rpmdb.c:377 -#, fuzzy, c-format -msgid "error(%d) getting \"%s\" records from %s index\n" -msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)" - -#: rpmdb/rpmdb.c:518 -#, fuzzy, c-format -msgid "error(%d) storing record %s into %s\n" -msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " - -#: rpmdb/rpmdb.c:538 -#, fuzzy, c-format -msgid "error(%d) removing record %s from %s\n" -msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ëºï½ü¤Ç¥¨¥é¡¼" - -#: rpmdb/rpmdb.c:797 +#: rpmdb/rpmdb.c:695 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#. error -#: rpmdb/rpmdb.c:1183 -#, fuzzy, c-format -msgid "error(%d) counting packages\n" -msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n" - -#: rpmdb/rpmdb.c:1986 rpmdb/rpmdb.c:3386 +#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007 +#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787 #, fuzzy, c-format -msgid "record number %u in database is bad -- skipping.\n" -msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥­¥Ã¥×¤·¤Þ¤¹" +msgid "error(%d) getting \"%s\" records from %s index\n" +msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)" -#: rpmdb/rpmdb.c:2052 +#: rpmdb/rpmdb.c:1930 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2326 +#: rpmdb/rpmdb.c:2189 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:2495 +#: rpmdb/rpmdb.c:2354 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2499 +#: rpmdb/rpmdb.c:2358 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "name ¥¤¥ó¥Ç¥Ã¥¯¥¹ºï½ü¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2692 +#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803 +#, fuzzy, c-format +msgid "error(%d) storing record %s into %s\n" +msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ " + +#: rpmdb/rpmdb.c:2416 +#, fuzzy, c-format +msgid "error(%d) removing record %s from %s\n" +msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ëºï½ü¤Ç¥¨¥é¡¼" + +#: rpmdb/rpmdb.c:2557 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n" -#: rpmdb/rpmdb.c:2887 +#: rpmdb/rpmdb.c:2763 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2891 +#: rpmdb/rpmdb.c:2767 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3272 +#: rpmdb/rpmdb.c:3137 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3305 +#: rpmdb/rpmdb.c:3172 msgid "no dbpath has been set" msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:3332 +#: rpmdb/rpmdb.c:3199 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rootdir %s Ãæ¤Ç¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3336 +#: rpmdb/rpmdb.c:3203 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "°ì»þŪ¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹" -#: rpmdb/rpmdb.c:3342 +#: rpmdb/rpmdb.c:3209 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3344 +#: rpmdb/rpmdb.c:3211 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3351 +#: rpmdb/rpmdb.c:3218 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3229 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3253 +#, fuzzy, c-format +msgid "record number %u in database is bad -- skipping.\n" +msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥­¥Ã¥×¤·¤Þ¤¹" + +#: rpmdb/rpmdb.c:3293 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ­¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:3444 +#: rpmdb/rpmdb.c:3311 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "" "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Þ¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3452 +#: rpmdb/rpmdb.c:3319 msgid "failed to replace old database with new database!\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤­´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n" -#: rpmdb/rpmdb.c:3454 +#: rpmdb/rpmdb.c:3321 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ð¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤­´¹¤¨¤Þ¤¹" -#: rpmdb/rpmdb.c:3464 +#: rpmdb/rpmdb.c:3331 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3466 +#: rpmdb/rpmdb.c:3333 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n" @@ -3534,6 +3491,26 @@ msgstr "url msgid "failed to create %s: %s\n" msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" +#, fuzzy +#~ msgid "removed db file %s\n" +#~ msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" + +#, fuzzy +#~ msgid "bad db file %s\n" +#~ msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s" + +#, fuzzy +#~ msgid "opening db file %s mode 0x%x\n" +#~ msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n" + +#, fuzzy +#~ msgid "cannot get %s lock on database\n" +#~ msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó" + +#, fuzzy +#~ msgid "error(%d) counting packages\n" +#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n" + #~ msgid "" #~ "free list corrupt (%u)- please run\n" #~ "\t\"rpm --rebuilddb\"\n" diff --git a/po/ko.po b/po/ko.po index 00e4e36..1aa80bb 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-02 19:33-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 2001-09-07 22:03+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -1502,7 +1502,7 @@ msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 +#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028 msgid "(not a number)" msgstr "(¼ýÀÚ°¡ ¾Æ´Õ´Ï´Ù)" @@ -2841,64 +2841,16 @@ msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" "%s-%s-%s: °íÁ¤ Çì´õ ¿µ¿ª Ãà¾à(immutable header region digest) °Ë»ç¿¡ ½ÇÆÐÇÔ\n" -#: rpmdb/db1.c:98 rpmdb/db3.c:85 +#: rpmdb/db3.c:85 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "%3$s ÀÇ db%1$d ¿À·ù(%2$d): %4$s\n" -#: rpmdb/db1.c:101 rpmdb/db3.c:88 +#: rpmdb/db3.c:88 #, c-format msgid "db%d error(%d): %s\n" msgstr "db%d ¿À·ù(%d): %s\n" -#: rpmdb/db1.c:168 -#, c-format -msgid "" -"Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" -msgstr "" -"¿ÀÇÁ¼Â %d(0x%08x)ÀÇ ÆÐÅ°Áö ¿¬°áºÎºÐ(chain)ÀÌ ¼Õ»óµÇ¾ú½À´Ï´Ù, Á¢±ÙÀ» Àç½Ãµµ ÇÕ" -"´Ï´Ù ...\n" - -#: rpmdb/db1.c:180 -#, c-format -msgid "Reconnecting broken chain at offset %d(0x%08x).\n" -msgstr "¼Õ»óµÈ ¿ÀÇÁ¼Â %d(0x%08x)ÀÇ ¿¬°áºÎºÐ(chain)¿¡ ÀçÁ¢±Ù ÇÕ´Ï´Ù.\n" - -#. @=branchstate@ -#: rpmdb/db1.c:506 -#, c-format -msgid "closed db file %s\n" -msgstr "´ÝÈù db ÆÄÀÏ %s\n" - -#: rpmdb/db1.c:509 -#, c-format -msgid "removed db file %s\n" -msgstr "»èÁ¦µÈ db ÆÄÀÏ %s\n" - -#: rpmdb/db1.c:544 -#, c-format -msgid "bad db file %s\n" -msgstr "À߸øµÈ db ÆÄÀÏ %s\n" - -#: rpmdb/db1.c:549 -#, c-format -msgid "opening db file %s mode 0x%x\n" -msgstr "¿­¸° db ÆÄÀÏ %s ¸ðµå 0x%x\n" - -#. XXX check errno validity -#: rpmdb/db1.c:572 -#, c-format -msgid "cannot get %s lock on database\n" -msgstr "Àá°ÜÀÖ´Â µ¥ÀÌÅͺ£À̽ºÀÇ %s (À»)¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù\n" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "exclusive" -msgstr "Á¦¿ÜÇÔ(exclusive)" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "shared" -msgstr "°øÀ¯µÊ" - #: rpmdb/db3.c:114 #, c-format msgid "closed db environment %s/%s\n" @@ -2914,27 +2866,35 @@ msgstr " msgid "opening db environment %s/%s %s\n" msgstr "¿­¸° db ȯ°æ %s/%s\n" -#: rpmdb/db3.c:561 +#: rpmdb/db3.c:605 #, c-format msgid "closed db index %s/%s\n" msgstr "´ÝÈù db À妽º %s/%s\n" -#: rpmdb/db3.c:628 +#: rpmdb/db3.c:672 #, c-format msgid "verified db index %s/%s\n" msgstr "°ËÁõµÈ db À妽º %s/%s\n" -#: rpmdb/db3.c:850 +#: rpmdb/db3.c:894 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "¿­¸° db À妽º %s/%s %s ¸ðµå=0x%x\n" -#: rpmdb/db3.c:1066 +#: rpmdb/db3.c:1110 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "Àá°ÜÀÖ´Â %2$s/%3$s ÀÇ %1$s (À»)¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/db3.c:1072 +#: rpmdb/db3.c:1112 +msgid "exclusive" +msgstr "Á¦¿ÜÇÔ(exclusive)" + +#: rpmdb/db3.c:1112 +msgid "shared" +msgstr "°øÀ¯µÊ" + +#: rpmdb/db3.c:1116 #, c-format msgid "locked db index %s/%s\n" msgstr "Àá±ä db À妽º %s/%s\n" @@ -2966,72 +2926,72 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE Ä«¿îÆ®´Â ¹Ýµå½Ã '1' À̾î¾ß ÇÕ´Ï´Ù.\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2208 +#: rpmdb/header.c:2210 msgid "missing { after %" msgstr "'%' µÚ¿¡ '{' ¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2238 +#: rpmdb/header.c:2240 msgid "missing } after %{" msgstr "'%{' µÚ¿¡ '}' ¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2254 msgid "empty tag format" msgstr "ÅÂ±× Çü½ÄÀÌ ºñ¾îÀÖ½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2268 msgid "empty tag name" msgstr "ÅÂ±× À̸§ÀÌ ºñ¾îÀÖ½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2283 +#: rpmdb/header.c:2285 msgid "unknown tag" msgstr "¾Ë ¼ö ¾ø´Â ÅÂ±× ÀÔ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2310 +#: rpmdb/header.c:2312 msgid "] expected at end of array" msgstr "¹è¿­ÀÇ ³¡ºÎºÐ¿¡ ']' °¡ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2330 msgid "unexpected ]" msgstr "ºÒÇÊ¿äÇÑ ']' °¡ »ç¿ëµÇ°í ÀÖ½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2332 +#: rpmdb/header.c:2334 msgid "unexpected }" msgstr "ºÒÇÊ¿äÇÑ '}' °¡ »ç¿ëµÇ°í ÀÖ½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2398 +#: rpmdb/header.c:2401 msgid "? expected in expression" msgstr "Ç¥Çö½Ä¿¡ '?' °¡ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2407 +#: rpmdb/header.c:2410 msgid "{ expected after ? in expression" msgstr "Ç¥Çö½Ä¿¡¼­ '?' µÚ¿¡ '{' °¡ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2420 rpmdb/header.c:2462 +#: rpmdb/header.c:2423 rpmdb/header.c:2468 msgid "} expected in expression" msgstr "Ç¥Çö½Ä¿¡ '}' °¡ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2430 +#: rpmdb/header.c:2433 msgid ": expected following ? subexpression" msgstr "ÇϺΠǥÇö½Ä(subexpression)ÀÇ '?' ´ÙÀ½¿¡ ':' ÀÌ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2447 +#: rpmdb/header.c:2453 msgid "{ expected after : in expression" msgstr "Ç¥Çö½Ä¿¡¼­ ':' µÚ¿¡ '{' °¡ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2472 +#: rpmdb/header.c:2478 msgid "| expected at end of expression" msgstr "Ç¥Çö½ÄÀÇ ³¡ºÎºÐ¿¡ '|' °¡ ÇÊ¿äÇÕ´Ï´Ù" @@ -3054,153 +3014,148 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "(±âÁ¸ÀÇ) rpm[23] ÆÐŰ¡°ú ȣȯÇÏ´Â Çì´õ¸¦ »ý¼ºÇÕ´Ï´Ù" #. @-modfilesys@ -#: rpmdb/rpmdb.c:161 +#: rpmdb/rpmdb.c:162 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" "DB ÅÂ±× ÃʱâÈ­[dbiTagsInit]: ÀÎÁõµÇÁö ¾ÊÀº ÅÂ±× À̸§: \"%s\" (Àº)´Â ¹«½ÃµË´Ï" "´Ù\n" -#: rpmdb/rpmdb.c:254 +#: rpmdb/rpmdb.c:234 #, 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:276 +#: rpmdb/rpmdb.c:256 #, c-format msgid "cannot open %s index\n" msgstr "%s À妽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:377 -#, c-format -msgid "error(%d) getting \"%s\" records from %s index\n" -msgstr "" -"%3$s À妽º¿¡¼­ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" - -#: rpmdb/rpmdb.c:518 -#, c-format -msgid "error(%d) storing record %s into %s\n" -msgstr "%3$s (À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" - -#: rpmdb/rpmdb.c:538 -#, c-format -msgid "error(%d) removing record %s from %s\n" -msgstr "%3$s ¿¡¼­ %2$s ·¹Äڵ带 »èÁ¦ÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" - -#: rpmdb/rpmdb.c:797 +#: rpmdb/rpmdb.c:695 msgid "no dbpath has been set\n" msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n" -#. error -#: rpmdb/rpmdb.c:1183 -#, c-format -msgid "error(%d) counting packages\n" -msgstr "ÆÐÅ°ÁöÀÇ ¼ö¸¦ ¼¼´Â µµÁß ¿À·ù(%d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" - -#: rpmdb/rpmdb.c:1986 rpmdb/rpmdb.c:3386 +#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007 +#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787 #, c-format -msgid "record number %u in database is bad -- skipping.\n" -msgstr "µ¥ÀÌÅͺ£À̽ºÀÇ ·¹ÄÚµå ¹øÈ£ %u (ÀÌ)°¡ À߸øµÇ¾ú½À´Ï´Ù -- »ý·«ÇÕ´Ï´Ù.\n" +msgid "error(%d) getting \"%s\" records from %s index\n" +msgstr "" +"%3$s À妽º¿¡¼­ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2052 +#: rpmdb/rpmdb.c:1930 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "rpmdb: ¼Õ»óµÈ Çì´õ #%u (ÀÌ)°¡ º¹±¸(retrieved)µÇ¾ú½À´Ï´Ù, »ý·«ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2326 +#: rpmdb/rpmdb.c:2189 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: 0x%x ÀÇ Çì´õ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2495 +#: rpmdb/rpmdb.c:2354 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "%2$s À妽º¿¡¼­ \"%1$s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2499 +#: rpmdb/rpmdb.c:2358 #, c-format msgid "removing %d entries from %s index.\n" msgstr "%2$s À妽º¿¡¼­ %1$d Ç׸ñµé(entries)À» »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2692 +#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803 +#, c-format +msgid "error(%d) storing record %s into %s\n" +msgstr "%3$s (À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" + +#: rpmdb/rpmdb.c:2416 +#, c-format +msgid "error(%d) removing record %s from %s\n" +msgstr "%3$s ¿¡¼­ %2$s ·¹Äڵ带 »èÁ¦ÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" + +#: rpmdb/rpmdb.c:2557 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "»õ·Î¿î ÆÐÅ°Áö¸¦ ¹èÄ¡ÇÏ´Â µµÁß ¿À·ù(%d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2887 +#: rpmdb/rpmdb.c:2763 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "%2$s À妽º¿¡ \"%1$s\" (À»)¸¦ Ãß°¡ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2891 +#: rpmdb/rpmdb.c:2767 #, c-format msgid "adding %d entries to %s index.\n" msgstr "%2$s À妽º¿¡ %1$d Ç׸ñµé(entries)À» Ãß°¡ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3272 +#: rpmdb/rpmdb.c:3137 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "db3¸¦ À籸Ãà ÇÑ ÈÄ¿¡ %s (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3305 +#: rpmdb/rpmdb.c:3172 msgid "no dbpath has been set" msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù" -#: rpmdb/rpmdb.c:3332 +#: rpmdb/rpmdb.c:3199 #, c-format msgid "rebuilding database %s into %s\n" msgstr "%2$s ¿¡ µ¥ÀÌÅͺ£À̽º %1$s (À»)¸¦ À籸Ãà ÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3336 +#: rpmdb/rpmdb.c:3203 #, c-format msgid "temporary database %s already exists\n" msgstr "Àӽà µ¥ÀÌÅͺ£À̽º %s (ÀÌ)°¡ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3342 +#: rpmdb/rpmdb.c:3209 #, c-format msgid "creating directory %s\n" msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3344 +#: rpmdb/rpmdb.c:3211 #, c-format msgid "creating directory %s: %s\n" msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÔ: %s\n" -#: rpmdb/rpmdb.c:3351 +#: rpmdb/rpmdb.c:3218 #, c-format msgid "opening old database with dbapi %d\n" msgstr "dbapi %d (À»)¸¦ ÅëÇØ ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3229 #, c-format msgid "opening new database with dbapi %d\n" msgstr "dbapi %d (À»)¸¦ ÅëÇØ »õ·Î¿î µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3253 +#, c-format +msgid "record number %u in database is bad -- skipping.\n" +msgstr "µ¥ÀÌÅͺ£À̽ºÀÇ ·¹ÄÚµå ¹øÈ£ %u (ÀÌ)°¡ À߸øµÇ¾ú½À´Ï´Ù -- »ý·«ÇÕ´Ï´Ù.\n" + +#: rpmdb/rpmdb.c:3293 #, c-format msgid "cannot add record originally at %u\n" msgstr "%u ¿¡ ·¹Äڵ带 Ãß°¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:3444 +#: rpmdb/rpmdb.c:3311 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "µ¥ÀÌÅͺ£À̽º¸¦ À籸ÃàÇϴµ¥ ½ÇÆÐÇÔ: ¿øº» µ¥ÀÌÅͺ£À̽º´Â ±×´ë·Î À¯ÁöµË´Ï´Ù\n" -#: rpmdb/rpmdb.c:3452 +#: rpmdb/rpmdb.c:3319 msgid "failed to replace old database with new database!\n" msgstr "ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ »õ·Î¿î µ¥ÀÌÅͺ£À̽º·Î ±³Ã¼Çϴµ¥ ½ÇÆÐÇß½À´Ï´Ù!\n" -#: rpmdb/rpmdb.c:3454 +#: rpmdb/rpmdb.c:3321 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "º¹±¸Çϱâ À§ÇØ $2$s ÀÇ ÆÄÀÏÀ» $1$s ÀÇ ÆÄÀÏ·Î ±³Ã¼ÇÕ´Ï´Ù" -#: rpmdb/rpmdb.c:3464 +#: rpmdb/rpmdb.c:3331 #, c-format msgid "removing directory %s\n" msgstr "%s µð·ºÅ丮¸¦ »èÁ¦ÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3466 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s µð·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆÐÇÔ: %s\n" @@ -3414,6 +3369,33 @@ msgid "failed to create %s: %s\n" msgstr "%s (À»)¸¦ »ý¼ºÇϴµ¥ ½ÇÆÐÇÔ: %s\n" #~ msgid "" +#~ "Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" +#~ msgstr "" +#~ "¿ÀÇÁ¼Â %d(0x%08x)ÀÇ ÆÐÅ°Áö ¿¬°áºÎºÐ(chain)ÀÌ ¼Õ»óµÇ¾ú½À´Ï´Ù, Á¢±ÙÀ» Àç½Ã" +#~ "µµ ÇÕ´Ï´Ù ...\n" + +#~ msgid "Reconnecting broken chain at offset %d(0x%08x).\n" +#~ msgstr "¼Õ»óµÈ ¿ÀÇÁ¼Â %d(0x%08x)ÀÇ ¿¬°áºÎºÐ(chain)¿¡ ÀçÁ¢±Ù ÇÕ´Ï´Ù.\n" + +#~ msgid "closed db file %s\n" +#~ msgstr "´ÝÈù db ÆÄÀÏ %s\n" + +#~ msgid "removed db file %s\n" +#~ msgstr "»èÁ¦µÈ db ÆÄÀÏ %s\n" + +#~ msgid "bad db file %s\n" +#~ msgstr "À߸øµÈ db ÆÄÀÏ %s\n" + +#~ msgid "opening db file %s mode 0x%x\n" +#~ msgstr "¿­¸° db ÆÄÀÏ %s ¸ðµå 0x%x\n" + +#~ msgid "cannot get %s lock on database\n" +#~ msgstr "Àá°ÜÀÖ´Â µ¥ÀÌÅͺ£À̽ºÀÇ %s (À»)¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù\n" + +#~ msgid "error(%d) counting packages\n" +#~ msgstr "ÆÐÅ°ÁöÀÇ ¼ö¸¦ ¼¼´Â µµÁß ¿À·ù(%d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" + +#~ msgid "" #~ "free list corrupt (%u)- please run\n" #~ "\t\"rpm --rebuilddb\"\n" #~ "More information is available from http://www.rpm.org or the rpm-" diff --git a/po/no.po b/po/no.po index d5baaf7..100c05b 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-02 19:33-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -1497,7 +1497,7 @@ msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 +#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028 msgid "(not a number)" msgstr "" @@ -2809,62 +2809,16 @@ msgstr "feilede avhengigheter:\n" msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:85 +#: rpmdb/db3.c:85 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:88 +#: rpmdb/db3.c:88 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db1.c:168 -#, c-format -msgid "" -"Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" -msgstr "" - -#: rpmdb/db1.c:180 -#, c-format -msgid "Reconnecting broken chain at offset %d(0x%08x).\n" -msgstr "" - -#. @=branchstate@ -#: rpmdb/db1.c:506 -#, c-format -msgid "closed db file %s\n" -msgstr "" - -#: rpmdb/db1.c:509 -#, c-format -msgid "removed db file %s\n" -msgstr "" - -#: rpmdb/db1.c:544 -#, c-format -msgid "bad db file %s\n" -msgstr "" - -#: rpmdb/db1.c:549 -#, c-format -msgid "opening db file %s mode 0x%x\n" -msgstr "" - -#. XXX check errno validity -#: rpmdb/db1.c:572 -#, c-format -msgid "cannot get %s lock on database\n" -msgstr "kan ikke åpne pakkedatabase i %s\n" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "exclusive" -msgstr "" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "shared" -msgstr "" - #: rpmdb/db3.c:114 #, c-format msgid "closed db environment %s/%s\n" @@ -2880,27 +2834,35 @@ msgstr "" msgid "opening db environment %s/%s %s\n" msgstr "" -#: rpmdb/db3.c:561 +#: rpmdb/db3.c:605 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:628 +#: rpmdb/db3.c:672 #, c-format msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:850 +#: rpmdb/db3.c:894 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1066 +#: rpmdb/db3.c:1110 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1072 +#: rpmdb/db3.c:1112 +msgid "exclusive" +msgstr "" + +#: rpmdb/db3.c:1112 +msgid "shared" +msgstr "" + +#: rpmdb/db3.c:1116 #, c-format msgid "locked db index %s/%s\n" msgstr "" @@ -2932,72 +2894,72 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2208 +#: rpmdb/header.c:2210 msgid "missing { after %" msgstr "mangler { etter %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2238 +#: rpmdb/header.c:2240 msgid "missing } after %{" msgstr "mangler } etter %{" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2254 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2268 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2283 +#: rpmdb/header.c:2285 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2310 +#: rpmdb/header.c:2312 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2330 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2332 +#: rpmdb/header.c:2334 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2398 +#: rpmdb/header.c:2401 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2407 +#: rpmdb/header.c:2410 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2420 rpmdb/header.c:2462 +#: rpmdb/header.c:2423 rpmdb/header.c:2468 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2430 +#: rpmdb/header.c:2433 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2447 +#: rpmdb/header.c:2453 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2472 +#: rpmdb/header.c:2478 msgid "| expected at end of expression" msgstr "" @@ -3018,149 +2980,144 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "generer headere som er kompatible med (gamle) rpm[23] pakker" #. @-modfilesys@ -#: rpmdb/rpmdb.c:161 +#: rpmdb/rpmdb.c:162 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:254 +#: rpmdb/rpmdb.c:234 #, 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:276 +#: rpmdb/rpmdb.c:256 #, c-format msgid "cannot open %s index\n" msgstr "kan ikke åpne %s indeks\n" -#: rpmdb/rpmdb.c:377 -#, c-format -msgid "error(%d) getting \"%s\" records from %s index\n" -msgstr "" - -#: rpmdb/rpmdb.c:518 -#, 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:538 -#, 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:797 +#: rpmdb/rpmdb.c:695 msgid "no dbpath has been set\n" msgstr "" -#. error -#: rpmdb/rpmdb.c:1183 -#, c-format -msgid "error(%d) counting packages\n" -msgstr "" - -#: rpmdb/rpmdb.c:1986 rpmdb/rpmdb.c:3386 +#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007 +#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787 #, c-format -msgid "record number %u in database is bad -- skipping.\n" +msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#: rpmdb/rpmdb.c:2052 +#: rpmdb/rpmdb.c:1930 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2326 +#: rpmdb/rpmdb.c:2189 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2495 +#: rpmdb/rpmdb.c:2354 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2499 +#: rpmdb/rpmdb.c:2358 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2692 +#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803 +#, 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:2416 +#, 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:2557 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2887 +#: rpmdb/rpmdb.c:2763 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2891 +#: rpmdb/rpmdb.c:2767 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3272 +#: rpmdb/rpmdb.c:3137 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3305 +#: rpmdb/rpmdb.c:3172 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3332 +#: rpmdb/rpmdb.c:3199 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3336 +#: rpmdb/rpmdb.c:3203 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3342 +#: rpmdb/rpmdb.c:3209 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3344 +#: rpmdb/rpmdb.c:3211 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3351 +#: rpmdb/rpmdb.c:3218 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3229 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3253 +#, c-format +msgid "record number %u in database is bad -- skipping.\n" +msgstr "" + +#: rpmdb/rpmdb.c:3293 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3444 +#: rpmdb/rpmdb.c:3311 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3452 +#: rpmdb/rpmdb.c:3319 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3454 +#: rpmdb/rpmdb.c:3321 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3464 +#: rpmdb/rpmdb.c:3331 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3466 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" @@ -3372,6 +3329,9 @@ msgstr "url-port m msgid "failed to create %s: %s\n" msgstr "kunne ikke opprette %s: %s\n" +#~ msgid "cannot get %s lock on database\n" +#~ msgstr "kan ikke åpne pakkedatabase i %s\n" + #, fuzzy #~ msgid "don't verify signature(s)" #~ msgstr "ikke verifiser sti til symbolske lenker for filer" diff --git a/po/pl.po b/po/pl.po index ebc8644..c4429e4 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-02 19:33-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -1541,7 +1541,7 @@ msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 +#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028 msgid "(not a number)" msgstr "(nie jest liczb±)" @@ -2907,62 +2907,16 @@ msgstr "Niespe msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:85 +#: rpmdb/db3.c:85 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:88 +#: rpmdb/db3.c:88 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db1.c:168 -#, c-format -msgid "" -"Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" -msgstr "" - -#: rpmdb/db1.c:180 -#, c-format -msgid "Reconnecting broken chain at offset %d(0x%08x).\n" -msgstr "" - -#. @=branchstate@ -#: rpmdb/db1.c:506 -#, c-format -msgid "closed db file %s\n" -msgstr "" - -#: rpmdb/db1.c:509 -#, fuzzy, c-format -msgid "removed db file %s\n" -msgstr "usuwanie indeksu plików dla %s\n" - -#: rpmdb/db1.c:544 -#, fuzzy, c-format -msgid "bad db file %s\n" -msgstr "b³êdny status pliku: %s" - -#: rpmdb/db1.c:549 -#, fuzzy, c-format -msgid "opening db file %s mode 0x%x\n" -msgstr "otwiernie bazê danych w trybie 0x%x w %s\n" - -#. XXX check errno validity -#: rpmdb/db1.c:572 -#, fuzzy, c-format -msgid "cannot get %s lock on database\n" -msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "exclusive" -msgstr "" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "shared" -msgstr "" - #: rpmdb/db3.c:114 #, fuzzy, c-format msgid "closed db environment %s/%s\n" @@ -2978,27 +2932,35 @@ msgstr "usuwanie indeksu plik msgid "opening db environment %s/%s %s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: rpmdb/db3.c:561 +#: rpmdb/db3.c:605 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: rpmdb/db3.c:628 +#: rpmdb/db3.c:672 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" -#: rpmdb/db3.c:850 +#: rpmdb/db3.c:894 #, 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:1066 +#: rpmdb/db3.c:1110 #, 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:1072 +#: rpmdb/db3.c:1112 +msgid "exclusive" +msgstr "" + +#: rpmdb/db3.c:1112 +msgid "shared" +msgstr "" + +#: rpmdb/db3.c:1116 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "usuwanie indeksu plików dla %s\n" @@ -3031,72 +2993,72 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabData() RPM_STRING_TYPE licznik musi byæ 1.\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2208 +#: rpmdb/header.c:2210 msgid "missing { after %" msgstr "brak { po %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2238 +#: rpmdb/header.c:2240 msgid "missing } after %{" msgstr "brak } po %{" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2254 msgid "empty tag format" msgstr "pusty format etykiety" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2268 msgid "empty tag name" msgstr "pusta nazwa etykiety" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2283 +#: rpmdb/header.c:2285 msgid "unknown tag" msgstr "nieznana etykieta" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2310 +#: rpmdb/header.c:2312 msgid "] expected at end of array" msgstr "spodziewany ] na koñcu tablicy" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2330 msgid "unexpected ]" msgstr "nie spodziewany ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2332 +#: rpmdb/header.c:2334 msgid "unexpected }" msgstr "nie spodziewany }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2398 +#: rpmdb/header.c:2401 msgid "? expected in expression" msgstr "spodziewany ? w wyra¿eniu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2407 +#: rpmdb/header.c:2410 msgid "{ expected after ? in expression" msgstr "spodziewany { po ? w wyra¿eniu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2420 rpmdb/header.c:2462 +#: rpmdb/header.c:2423 rpmdb/header.c:2468 msgid "} expected in expression" msgstr "spodziewany } w wyra¿eniu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2430 +#: rpmdb/header.c:2433 msgid ": expected following ? subexpression" msgstr "spodziewany : po podwyra¿eniu ?" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2447 +#: rpmdb/header.c:2453 msgid "{ expected after : in expression" msgstr "spodziewany { po : w wyra¿eniu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2472 +#: rpmdb/header.c:2478 msgid "| expected at end of expression" msgstr "spodziewany | na koñcu wyra¿enia" @@ -3119,151 +3081,146 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:161 +#: rpmdb/rpmdb.c:162 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:254 +#: rpmdb/rpmdb.c:234 #, 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:276 +#: rpmdb/rpmdb.c:256 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "nie mo¿na otworzyæ %s\n" -#: rpmdb/rpmdb.c:377 -#, fuzzy, c-format -msgid "error(%d) getting \"%s\" records from %s index\n" -msgstr "b³±d pobierania rekordu %s z %s" - -#: rpmdb/rpmdb.c:518 -#, fuzzy, c-format -msgid "error(%d) storing record %s into %s\n" -msgstr "b³±d zapisywania rekordu %s do %s" - -#: rpmdb/rpmdb.c:538 -#, fuzzy, c-format -msgid "error(%d) removing record %s from %s\n" -msgstr "b³±d usuwania rekordu %s z %s" - -#: rpmdb/rpmdb.c:797 +#: rpmdb/rpmdb.c:695 #, fuzzy msgid "no dbpath has been set\n" msgstr "¶cie¿ka bazy danych nie zosta³a podana" -#. error -#: rpmdb/rpmdb.c:1183 -#, fuzzy, c-format -msgid "error(%d) counting packages\n" -msgstr "b³±d szukania pakietu %s\n" - -#: rpmdb/rpmdb.c:1986 rpmdb/rpmdb.c:3386 +#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007 +#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787 #, 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" +msgid "error(%d) getting \"%s\" records from %s index\n" +msgstr "b³±d pobierania rekordu %s z %s" -#: rpmdb/rpmdb.c:2052 +#: rpmdb/rpmdb.c:1930 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2326 +#: rpmdb/rpmdb.c:2189 #, 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:2495 +#: rpmdb/rpmdb.c:2354 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "usuwanie indeksu grupy\n" -#: rpmdb/rpmdb.c:2499 +#: rpmdb/rpmdb.c:2358 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "usuwanie indeksu nazw\n" -#: rpmdb/rpmdb.c:2692 +#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803 +#, fuzzy, c-format +msgid "error(%d) storing record %s into %s\n" +msgstr "b³±d zapisywania rekordu %s do %s" + +#: rpmdb/rpmdb.c:2416 +#, fuzzy, c-format +msgid "error(%d) removing record %s from %s\n" +msgstr "b³±d usuwania rekordu %s z %s" + +#: rpmdb/rpmdb.c:2557 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "b³±d szukania pakietu %s\n" -#: rpmdb/rpmdb.c:2887 +#: rpmdb/rpmdb.c:2763 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "zmiana nazwy %s na %s\n" -#: rpmdb/rpmdb.c:2891 +#: rpmdb/rpmdb.c:2767 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "zmiana nazwy %s na %s\n" -#: rpmdb/rpmdb.c:3272 +#: rpmdb/rpmdb.c:3137 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3305 +#: rpmdb/rpmdb.c:3172 msgid "no dbpath has been set" msgstr "¶cie¿ka bazy danych nie zosta³a podana" -#: rpmdb/rpmdb.c:3332 +#: rpmdb/rpmdb.c:3199 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "odbudowywujê bazê danych w rootdir %s\n" -#: rpmdb/rpmdb.c:3336 +#: rpmdb/rpmdb.c:3203 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "tymczasowa baza danych %s ju¿ istnieje" -#: rpmdb/rpmdb.c:3342 +#: rpmdb/rpmdb.c:3209 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3344 +#: rpmdb/rpmdb.c:3211 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3351 +#: rpmdb/rpmdb.c:3218 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "otwieranie starej bazy danych\n" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3229 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "otwieranie nowej bazy danych\n" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3253 +#, 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:3293 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "nie mo¿na dodaæ rekordu oryginalnie przy %d" -#: rpmdb/rpmdb.c:3444 +#: rpmdb/rpmdb.c:3311 #, 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:3452 +#: rpmdb/rpmdb.c:3319 msgid "failed to replace old database with new database!\n" msgstr "zamiana starej bazy na now± nie powiod³a siê!\n" -#: rpmdb/rpmdb.c:3454 +#: rpmdb/rpmdb.c:3321 #, 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:3464 +#: rpmdb/rpmdb.c:3331 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3466 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n" @@ -3480,6 +3437,26 @@ msgid "failed to create %s: %s\n" msgstr "utworzenie %s nie powiod³o siê\n" #, fuzzy +#~ msgid "removed db file %s\n" +#~ msgstr "usuwanie indeksu plików dla %s\n" + +#, fuzzy +#~ msgid "bad db file %s\n" +#~ msgstr "b³êdny status pliku: %s" + +#, fuzzy +#~ msgid "opening db file %s mode 0x%x\n" +#~ msgstr "otwiernie bazê danych w trybie 0x%x w %s\n" + +#, fuzzy +#~ msgid "cannot get %s lock on database\n" +#~ msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe" + +#, fuzzy +#~ msgid "error(%d) counting packages\n" +#~ msgstr "b³±d szukania pakietu %s\n" + +#, fuzzy #~ msgid "" #~ "old format database is present; use --rebuilddb to generate a new format " #~ "database\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index f156438..8d1cee6 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-02 19:33-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" #: build.c:38 #, fuzzy @@ -1652,7 +1652,7 @@ msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 +#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028 msgid "(not a number)" msgstr "" @@ -3064,63 +3064,16 @@ msgstr "lista dependncias do pacote" msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:85 +#: rpmdb/db3.c:85 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:88 +#: rpmdb/db3.c:88 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db1.c:168 -#, c-format -msgid "" -"Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" -msgstr "" - -#: rpmdb/db1.c:180 -#, c-format -msgid "Reconnecting broken chain at offset %d(0x%08x).\n" -msgstr "" - -#. @=branchstate@ -#: rpmdb/db1.c:506 -#, c-format -msgid "closed db file %s\n" -msgstr "" - -#: rpmdb/db1.c:509 -#, c-format -msgid "removed db file %s\n" -msgstr "" - -# , c-format -#: rpmdb/db1.c:544 -#, fuzzy, c-format -msgid "bad db file %s\n" -msgstr "No consegui abrir: %s\n" - -#: rpmdb/db1.c:549 -#, fuzzy, c-format -msgid "opening db file %s mode 0x%x\n" -msgstr "reconstrua o banco de dados a partir de um banco de dados existente" - -#. XXX check errno validity -#: rpmdb/db1.c:572 -#, fuzzy, c-format -msgid "cannot get %s lock on database\n" -msgstr "no foi passado pacote para desinstalao" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "exclusive" -msgstr "" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "shared" -msgstr "" - #: rpmdb/db3.c:114 #, c-format msgid "closed db environment %s/%s\n" @@ -3136,27 +3089,35 @@ msgstr "" 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:561 +#: rpmdb/db3.c:605 #, 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:628 +#: rpmdb/db3.c:672 #, 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:850 +#: rpmdb/db3.c:894 #, 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:1066 +#: rpmdb/db3.c:1110 #, fuzzy, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "no foi passado pacote para desinstalao" -#: rpmdb/db3.c:1072 +#: rpmdb/db3.c:1112 +msgid "exclusive" +msgstr "" + +#: rpmdb/db3.c:1112 +msgid "shared" +msgstr "" + +#: rpmdb/db3.c:1116 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" @@ -3188,74 +3149,74 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2208 +#: rpmdb/header.c:2210 msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2238 +#: rpmdb/header.c:2240 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2254 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2268 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2283 +#: rpmdb/header.c:2285 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2310 +#: rpmdb/header.c:2312 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2330 #, fuzzy msgid "unexpected ]" msgstr "fonte de pesquisa no esperado" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2332 +#: rpmdb/header.c:2334 #, fuzzy msgid "unexpected }" msgstr "fonte de pesquisa no esperado" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2398 +#: rpmdb/header.c:2401 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2407 +#: rpmdb/header.c:2410 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2420 rpmdb/header.c:2462 +#: rpmdb/header.c:2423 rpmdb/header.c:2468 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2430 +#: rpmdb/header.c:2433 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2447 +#: rpmdb/header.c:2453 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2472 +#: rpmdb/header.c:2478 msgid "| expected at end of expression" msgstr "" @@ -3278,148 +3239,143 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:161 +#: rpmdb/rpmdb.c:162 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:254 +#: rpmdb/rpmdb.c:234 #, 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:276 +#: rpmdb/rpmdb.c:256 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "No consegui abrir: %s\n" -# , c-format -#: rpmdb/rpmdb.c:377 -#, fuzzy, c-format -msgid "error(%d) getting \"%s\" records from %s index\n" -msgstr "No consegui abrir: %s\n" - -# , c-format -#: rpmdb/rpmdb.c:518 -#, fuzzy, c-format -msgid "error(%d) storing record %s into %s\n" -msgstr "No consegui abrir: %s\n" - -# , c-format -#: rpmdb/rpmdb.c:538 -#, fuzzy, c-format -msgid "error(%d) removing record %s from %s\n" -msgstr "No consegui abrir: %s\n" - -#: rpmdb/rpmdb.c:797 +#: rpmdb/rpmdb.c:695 msgid "no dbpath has been set\n" msgstr "" -#. error -#: rpmdb/rpmdb.c:1183 +# , c-format +#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007 +#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787 #, fuzzy, c-format -msgid "error(%d) counting packages\n" -msgstr "no foi passado pacote para instalao" - -#: rpmdb/rpmdb.c:1986 rpmdb/rpmdb.c:3386 -#, c-format -msgid "record number %u in database is bad -- skipping.\n" -msgstr "" +msgid "error(%d) getting \"%s\" records from %s index\n" +msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:2052 +#: rpmdb/rpmdb.c:1930 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2326 +#: rpmdb/rpmdb.c:2189 #, fuzzy, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "no foi passado pacote para desinstalao" -#: rpmdb/rpmdb.c:2495 +#: rpmdb/rpmdb.c:2354 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:2499 +#: rpmdb/rpmdb.c:2358 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:2692 +# , c-format +#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803 +#, fuzzy, c-format +msgid "error(%d) storing record %s into %s\n" +msgstr "No consegui abrir: %s\n" + +# , c-format +#: rpmdb/rpmdb.c:2416 +#, fuzzy, c-format +msgid "error(%d) removing record %s from %s\n" +msgstr "No consegui abrir: %s\n" + +#: rpmdb/rpmdb.c:2557 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "no foi passado pacote para instalao" -#: rpmdb/rpmdb.c:2887 +#: rpmdb/rpmdb.c:2763 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:2891 +#: rpmdb/rpmdb.c:2767 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:3272 +#: rpmdb/rpmdb.c:3137 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3305 +#: rpmdb/rpmdb.c:3172 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3332 +#: rpmdb/rpmdb.c:3199 #, 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:3336 +#: rpmdb/rpmdb.c:3203 #, c-format msgid "temporary database %s already exists\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:3342 +#: rpmdb/rpmdb.c:3209 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:3344 +#: rpmdb/rpmdb.c:3211 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:3351 +#: rpmdb/rpmdb.c:3218 #, 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:3362 +#: rpmdb/rpmdb.c:3229 #, 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:3426 +#: rpmdb/rpmdb.c:3253 +#, c-format +msgid "record number %u in database is bad -- skipping.\n" +msgstr "" + +#: rpmdb/rpmdb.c:3293 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3444 +#: rpmdb/rpmdb.c:3311 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3452 +#: rpmdb/rpmdb.c:3319 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3454 +#: rpmdb/rpmdb.c:3321 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" @@ -3432,13 +3388,13 @@ msgstr "" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: rpmdb/rpmdb.c:3464 +#: rpmdb/rpmdb.c:3331 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "RPM verso %s\n" # , c-format -#: rpmdb/rpmdb.c:3466 +#: rpmdb/rpmdb.c:3333 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "No consegui abrir: %s\n" @@ -3653,6 +3609,23 @@ msgstr "" msgid "failed to create %s: %s\n" msgstr "No consegui abrir o pipe tar: %s\n" +# , c-format +#, fuzzy +#~ msgid "bad db file %s\n" +#~ msgstr "No consegui abrir: %s\n" + +#, fuzzy +#~ msgid "opening db file %s mode 0x%x\n" +#~ msgstr "reconstrua o banco de dados a partir de um banco de dados existente" + +#, fuzzy +#~ msgid "cannot get %s lock on database\n" +#~ msgstr "no foi passado pacote para desinstalao" + +#, fuzzy +#~ msgid "error(%d) counting packages\n" +#~ msgstr "no foi passado pacote para instalao" + #, fuzzy #~ msgid "don't verify signature(s)" #~ msgstr "instale pacote" diff --git a/po/ro.po b/po/ro.po index ac28d07..08d10e8 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-02 19:33-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -1474,7 +1474,7 @@ msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 +#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028 msgid "(not a number)" msgstr "" @@ -2763,62 +2763,16 @@ msgstr "" msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:85 +#: rpmdb/db3.c:85 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:88 +#: rpmdb/db3.c:88 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db1.c:168 -#, c-format -msgid "" -"Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" -msgstr "" - -#: rpmdb/db1.c:180 -#, c-format -msgid "Reconnecting broken chain at offset %d(0x%08x).\n" -msgstr "" - -#. @=branchstate@ -#: rpmdb/db1.c:506 -#, c-format -msgid "closed db file %s\n" -msgstr "" - -#: rpmdb/db1.c:509 -#, c-format -msgid "removed db file %s\n" -msgstr "" - -#: rpmdb/db1.c:544 -#, c-format -msgid "bad db file %s\n" -msgstr "" - -#: rpmdb/db1.c:549 -#, c-format -msgid "opening db file %s mode 0x%x\n" -msgstr "" - -#. XXX check errno validity -#: rpmdb/db1.c:572 -#, c-format -msgid "cannot get %s lock on database\n" -msgstr "" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "exclusive" -msgstr "" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "shared" -msgstr "" - #: rpmdb/db3.c:114 #, c-format msgid "closed db environment %s/%s\n" @@ -2834,27 +2788,35 @@ msgstr "" msgid "opening db environment %s/%s %s\n" msgstr "" -#: rpmdb/db3.c:561 +#: rpmdb/db3.c:605 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:628 +#: rpmdb/db3.c:672 #, c-format msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:850 +#: rpmdb/db3.c:894 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1066 +#: rpmdb/db3.c:1110 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1072 +#: rpmdb/db3.c:1112 +msgid "exclusive" +msgstr "" + +#: rpmdb/db3.c:1112 +msgid "shared" +msgstr "" + +#: rpmdb/db3.c:1116 #, c-format msgid "locked db index %s/%s\n" msgstr "" @@ -2886,72 +2848,72 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2208 +#: rpmdb/header.c:2210 msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2238 +#: rpmdb/header.c:2240 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2254 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2268 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2283 +#: rpmdb/header.c:2285 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2310 +#: rpmdb/header.c:2312 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2330 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2332 +#: rpmdb/header.c:2334 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2398 +#: rpmdb/header.c:2401 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2407 +#: rpmdb/header.c:2410 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2420 rpmdb/header.c:2462 +#: rpmdb/header.c:2423 rpmdb/header.c:2468 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2430 +#: rpmdb/header.c:2433 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2447 +#: rpmdb/header.c:2453 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2472 +#: rpmdb/header.c:2478 msgid "| expected at end of expression" msgstr "" @@ -2972,149 +2934,144 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:161 +#: rpmdb/rpmdb.c:162 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:254 +#: rpmdb/rpmdb.c:234 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:276 +#: rpmdb/rpmdb.c:256 #, c-format msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:377 -#, c-format -msgid "error(%d) getting \"%s\" records from %s index\n" -msgstr "" - -#: rpmdb/rpmdb.c:518 -#, c-format -msgid "error(%d) storing record %s into %s\n" +#: rpmdb/rpmdb.c:695 +msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:538 +#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007 +#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787 #, c-format -msgid "error(%d) removing record %s from %s\n" -msgstr "" - -#: rpmdb/rpmdb.c:797 -msgid "no dbpath has been set\n" +msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#. error -#: rpmdb/rpmdb.c:1183 +#: rpmdb/rpmdb.c:1930 #, c-format -msgid "error(%d) counting packages\n" +msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:1986 rpmdb/rpmdb.c:3386 +#: rpmdb/rpmdb.c:2189 #, c-format -msgid "record number %u in database is bad -- skipping.\n" +msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2052 +#: rpmdb/rpmdb.c:2354 #, c-format -msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" +msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2326 +#: rpmdb/rpmdb.c:2358 #, c-format -msgid "%s: cannot read header at 0x%x\n" +msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2495 +#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803 #, c-format -msgid "removing \"%s\" from %s index.\n" +msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2499 +#: rpmdb/rpmdb.c:2416 #, c-format -msgid "removing %d entries from %s index.\n" +msgid "error(%d) removing record %s from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2692 +#: rpmdb/rpmdb.c:2557 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2887 +#: rpmdb/rpmdb.c:2763 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2891 +#: rpmdb/rpmdb.c:2767 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3272 +#: rpmdb/rpmdb.c:3137 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3305 +#: rpmdb/rpmdb.c:3172 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3332 +#: rpmdb/rpmdb.c:3199 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3336 +#: rpmdb/rpmdb.c:3203 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3342 +#: rpmdb/rpmdb.c:3209 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3344 +#: rpmdb/rpmdb.c:3211 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3351 +#: rpmdb/rpmdb.c:3218 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3229 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3253 +#, c-format +msgid "record number %u in database is bad -- skipping.\n" +msgstr "" + +#: rpmdb/rpmdb.c:3293 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3444 +#: rpmdb/rpmdb.c:3311 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3452 +#: rpmdb/rpmdb.c:3319 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3454 +#: rpmdb/rpmdb.c:3321 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3464 +#: rpmdb/rpmdb.c:3331 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3466 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index de74a14..0f7e9c9 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-02 19:33-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1480,7 +1480,7 @@ msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 +#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028 msgid "(not a number)" msgstr "" @@ -2769,62 +2769,16 @@ msgstr "" msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:85 +#: rpmdb/db3.c:85 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:88 +#: rpmdb/db3.c:88 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db1.c:168 -#, c-format -msgid "" -"Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" -msgstr "" - -#: rpmdb/db1.c:180 -#, c-format -msgid "Reconnecting broken chain at offset %d(0x%08x).\n" -msgstr "" - -#. @=branchstate@ -#: rpmdb/db1.c:506 -#, c-format -msgid "closed db file %s\n" -msgstr "" - -#: rpmdb/db1.c:509 -#, c-format -msgid "removed db file %s\n" -msgstr "" - -#: rpmdb/db1.c:544 -#, c-format -msgid "bad db file %s\n" -msgstr "" - -#: rpmdb/db1.c:549 -#, c-format -msgid "opening db file %s mode 0x%x\n" -msgstr "" - -#. XXX check errno validity -#: rpmdb/db1.c:572 -#, c-format -msgid "cannot get %s lock on database\n" -msgstr "" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "exclusive" -msgstr "" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "shared" -msgstr "" - #: rpmdb/db3.c:114 #, c-format msgid "closed db environment %s/%s\n" @@ -2840,27 +2794,35 @@ msgstr "" msgid "opening db environment %s/%s %s\n" msgstr "" -#: rpmdb/db3.c:561 +#: rpmdb/db3.c:605 #, c-format msgid "closed db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:628 +#: rpmdb/db3.c:672 #, c-format msgid "verified db index %s/%s\n" msgstr "" -#: rpmdb/db3.c:850 +#: rpmdb/db3.c:894 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "" -#: rpmdb/db3.c:1066 +#: rpmdb/db3.c:1110 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "" -#: rpmdb/db3.c:1072 +#: rpmdb/db3.c:1112 +msgid "exclusive" +msgstr "" + +#: rpmdb/db3.c:1112 +msgid "shared" +msgstr "" + +#: rpmdb/db3.c:1116 #, c-format msgid "locked db index %s/%s\n" msgstr "" @@ -2892,72 +2854,72 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2208 +#: rpmdb/header.c:2210 msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2238 +#: rpmdb/header.c:2240 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2254 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2268 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2283 +#: rpmdb/header.c:2285 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2310 +#: rpmdb/header.c:2312 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2330 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2332 +#: rpmdb/header.c:2334 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2398 +#: rpmdb/header.c:2401 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2407 +#: rpmdb/header.c:2410 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2420 rpmdb/header.c:2462 +#: rpmdb/header.c:2423 rpmdb/header.c:2468 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2430 +#: rpmdb/header.c:2433 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2447 +#: rpmdb/header.c:2453 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2472 +#: rpmdb/header.c:2478 msgid "| expected at end of expression" msgstr "" @@ -2978,149 +2940,144 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:161 +#: rpmdb/rpmdb.c:162 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:254 +#: rpmdb/rpmdb.c:234 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "" -#: rpmdb/rpmdb.c:276 +#: rpmdb/rpmdb.c:256 #, c-format msgid "cannot open %s index\n" msgstr "" -#: rpmdb/rpmdb.c:377 -#, c-format -msgid "error(%d) getting \"%s\" records from %s index\n" -msgstr "" - -#: rpmdb/rpmdb.c:518 -#, c-format -msgid "error(%d) storing record %s into %s\n" +#: rpmdb/rpmdb.c:695 +msgid "no dbpath has been set\n" msgstr "" -#: rpmdb/rpmdb.c:538 +#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007 +#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787 #, c-format -msgid "error(%d) removing record %s from %s\n" -msgstr "" - -#: rpmdb/rpmdb.c:797 -msgid "no dbpath has been set\n" +msgid "error(%d) getting \"%s\" records from %s index\n" msgstr "" -#. error -#: rpmdb/rpmdb.c:1183 +#: rpmdb/rpmdb.c:1930 #, c-format -msgid "error(%d) counting packages\n" +msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:1986 rpmdb/rpmdb.c:3386 +#: rpmdb/rpmdb.c:2189 #, c-format -msgid "record number %u in database is bad -- skipping.\n" +msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2052 +#: rpmdb/rpmdb.c:2354 #, c-format -msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" +msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2326 +#: rpmdb/rpmdb.c:2358 #, c-format -msgid "%s: cannot read header at 0x%x\n" +msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2495 +#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803 #, c-format -msgid "removing \"%s\" from %s index.\n" +msgid "error(%d) storing record %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:2499 +#: rpmdb/rpmdb.c:2416 #, c-format -msgid "removing %d entries from %s index.\n" +msgid "error(%d) removing record %s from %s\n" msgstr "" -#: rpmdb/rpmdb.c:2692 +#: rpmdb/rpmdb.c:2557 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2887 +#: rpmdb/rpmdb.c:2763 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2891 +#: rpmdb/rpmdb.c:2767 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3272 +#: rpmdb/rpmdb.c:3137 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3305 +#: rpmdb/rpmdb.c:3172 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3332 +#: rpmdb/rpmdb.c:3199 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3336 +#: rpmdb/rpmdb.c:3203 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3342 +#: rpmdb/rpmdb.c:3209 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3344 +#: rpmdb/rpmdb.c:3211 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3351 +#: rpmdb/rpmdb.c:3218 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3229 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3253 +#, c-format +msgid "record number %u in database is bad -- skipping.\n" +msgstr "" + +#: rpmdb/rpmdb.c:3293 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3444 +#: rpmdb/rpmdb.c:3311 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3452 +#: rpmdb/rpmdb.c:3319 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3454 +#: rpmdb/rpmdb.c:3321 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3464 +#: rpmdb/rpmdb.c:3331 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3466 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 77bd437..786a279 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-02 19:33-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 2001-08-29 13:55-0400\n" "Last-Translator: Eugene Kanter \n" "Language-Team: Black Cat Linux Team \n" @@ -1521,7 +1521,7 @@ msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 +#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028 msgid "(not a number)" msgstr "(ÎÅ ÞÉÓÌÏ)" @@ -2848,63 +2848,16 @@ msgstr " msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "%s-%s-%s: ÎÅÐÒÁ×ÉÌØÎÁÑ ÐÏÄÐÉÓØ ÏÂÌÁÓÔÉ ÚÁÇÏÌÏ×ËÁ ÐÁËÅÔÁ\n" -#: rpmdb/db1.c:98 rpmdb/db3.c:85 +#: rpmdb/db3.c:85 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "ÏÛÉÂËÁ(%d) db%d ÉÚ %s: %s\n" -#: rpmdb/db1.c:101 rpmdb/db3.c:88 +#: rpmdb/db3.c:88 #, c-format msgid "db%d error(%d): %s\n" msgstr "ÏÛÉÂËÁ(%d) db%d: %s\n" -#: rpmdb/db1.c:168 -#, c-format -msgid "" -"Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" -msgstr "" -"ãÅÐÏÞËÁ ÐÁËÅÔÏ× ÏÂÏÒ×ÁÎÁ ÎÁ ÓÍÅÝÅÎÉÉ %d(0x%08x), ÐÏÐÙÔËÁ ÓÏÅÄÉÎÅÎÉÑ...\n" - -#: rpmdb/db1.c:180 -#, c-format -msgid "Reconnecting broken chain at offset %d(0x%08x).\n" -msgstr "óÏÅÄÉÎÑÅÔÓÑ ÏÂÏÒ×ÁÎÎÁÑ Ó×ÑÚØ × ÓÍÅÝÅÎÉÉ %d(0x%08x).\n" - -#. @=branchstate@ -#: rpmdb/db1.c:506 -#, c-format -msgid "closed db file %s\n" -msgstr "ÚÁËÒÙÔ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n" - -#: rpmdb/db1.c:509 -#, c-format -msgid "removed db file %s\n" -msgstr "ÕÄẠ́ΠÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n" - -#: rpmdb/db1.c:544 -#, c-format -msgid "bad db file %s\n" -msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n" - -#: rpmdb/db1.c:549 -#, c-format -msgid "opening db file %s mode 0x%x\n" -msgstr "ÏÔËÒÙ×ÅÔÓÑ ÆÁÊÌ %s ÂÁÚÙ ÄÁÎÎÙÈ × ÒÅÖÉÍÅ 0x%x\n" - -#. XXX check errno validity -#: rpmdb/db1.c:572 -#, c-format -msgid "cannot get %s lock on database\n" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÂÌÏËÉÒÏ×ËÕ %s ÂÁÚÙ ÄÁÎÎÙÈ\n" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "exclusive" -msgstr "ÉÓËÌÀÞÉÔÅÌØÎÙÊ" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "shared" -msgstr "ÒÁÚÄÅÌÑÅÍÙÊ" - #: rpmdb/db3.c:114 #, c-format msgid "closed db environment %s/%s\n" @@ -2920,27 +2873,35 @@ msgstr " msgid "opening db environment %s/%s %s\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÏËÒÕÖÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s %s\n" -#: rpmdb/db3.c:561 +#: rpmdb/db3.c:605 #, c-format msgid "closed db index %s/%s\n" msgstr "ÚÁËÒÙÔ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n" -#: rpmdb/db3.c:628 +#: rpmdb/db3.c:672 #, c-format msgid "verified db index %s/%s\n" msgstr "ÐÒÏ×ÅÒÅÎ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n" -#: rpmdb/db3.c:850 +#: rpmdb/db3.c:894 #, c-format msgid "opening db index %s/%s %s mode=0x%x\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s %s mode=0x%x\n" -#: rpmdb/db3.c:1066 +#: rpmdb/db3.c:1110 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÂÌÏËÉÒÏ×ËÕ %s ÎÁ %s/%s\n" -#: rpmdb/db3.c:1072 +#: rpmdb/db3.c:1112 +msgid "exclusive" +msgstr "ÉÓËÌÀÞÉÔÅÌØÎÙÊ" + +#: rpmdb/db3.c:1112 +msgid "shared" +msgstr "ÒÁÚÄÅÌÑÅÍÙÊ" + +#: rpmdb/db3.c:1116 #, c-format msgid "locked db index %s/%s\n" msgstr "ÚÁÂÌÏËÉÒÏ×ÁÎ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n" @@ -2973,72 +2934,72 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() ÄÏÐÕÓÔÉÍ ÔÏÌØËÏ ÏÄÉÎ ÜÌÅÍÅÎÔ ÔÉÐÁ RPM_STRING_TYPE\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2208 +#: rpmdb/header.c:2210 msgid "missing { after %" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ \"{\" ÐÏÓÌÅ \"%\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2238 +#: rpmdb/header.c:2240 msgid "missing } after %{" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ \"}\" ÐÏÓÌÅ \"%{\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2254 msgid "empty tag format" msgstr "ÐÕÓÔÏÊ ÆÏÒÍÁÔ ÔÜÇÁ" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2268 msgid "empty tag name" msgstr "ÐÕÓÔÏÅ ÉÍÑ ÔÜÇÁ" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2283 +#: rpmdb/header.c:2285 msgid "unknown tag" msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÜÇ" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2310 +#: rpmdb/header.c:2312 msgid "] expected at end of array" msgstr "× ËÏÎÃÅ ÍÁÓÓÉ×Á ÏÖÉÄÁÌÁÓØ \"]\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2330 msgid "unexpected ]" msgstr "ÎÅÏÖÉÄÁÎÎÁÑ \"]\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2332 +#: rpmdb/header.c:2334 msgid "unexpected }" msgstr "ÎÅÏÖÉÄÁÎÎÁÑ \"}\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2398 +#: rpmdb/header.c:2401 msgid "? expected in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÏÖÉÄÁÌÏÓØ \"?\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2407 +#: rpmdb/header.c:2410 msgid "{ expected after ? in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \"?\" ÏÖÉÄÁÌÏÓØ \"{\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2420 rpmdb/header.c:2462 +#: rpmdb/header.c:2423 rpmdb/header.c:2468 msgid "} expected in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÏÖÉÄÁÌÏÓØ \"}\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2430 +#: rpmdb/header.c:2433 msgid ": expected following ? subexpression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \"?\" ÏÖÉÄÁÌÏÓØ \":\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2447 +#: rpmdb/header.c:2453 msgid "{ expected after : in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \":\" ÏÖÉÄÁÌÏÓØ \"{\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2472 +#: rpmdb/header.c:2478 msgid "| expected at end of expression" msgstr "× ËÏÎÃÅ ×ÙÒÁÖÅÎÉÑ ÏÖÉÄÁÌÓÑ \"|\"" @@ -3061,150 +3022,145 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "ÓÏÚÄÁÔØ ÚÁÇÏÌÏ×ËÉ, ÓÏ×ÍÅÓÔÉÍÙÅ Ó (ÕÓÔÁÒÅ×ÛÉÍÉ) ÐÁËÅÔÁÍÉ rpm[23]" #. @-modfilesys@ -#: rpmdb/rpmdb.c:161 +#: rpmdb/rpmdb.c:162 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: ÉÍÑ ËÌÀÞÁ \"%s\" ÎÅ ÉÚ×ÅÓÔÎÏ, ÉÇÎÏÒÉÒÕÅÔÓÑ\n" -#: rpmdb/rpmdb.c:254 +#: rpmdb/rpmdb.c:234 #, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÄÅËÓ %s ÉÓÐÏÌØÚÕÑ db%d - %s (%d)\n" -#: rpmdb/rpmdb.c:276 +#: rpmdb/rpmdb.c:256 #, c-format msgid "cannot open %s index\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÄÅËÓ %s\n" -#: rpmdb/rpmdb.c:377 -#, c-format -msgid "error(%d) getting \"%s\" records from %s index\n" -msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n" - -#: rpmdb/rpmdb.c:518 -#, c-format -msgid "error(%d) storing record %s into %s\n" -msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n" - -#: rpmdb/rpmdb.c:538 -#, c-format -msgid "error(%d) removing record %s from %s\n" -msgstr "ÏÛÉÂËÁ(%d) ÕÄÁÌÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s\n" - -#: rpmdb/rpmdb.c:797 +#: rpmdb/rpmdb.c:695 msgid "no dbpath has been set\n" msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" -#. error -#: rpmdb/rpmdb.c:1183 -#, c-format -msgid "error(%d) counting packages\n" -msgstr "ÏÛÉÂËÁ(%d) ÐÒÉ ÐÏÄÓÞ£ÔÅ ÐÁËÅÔÏ×\n" - -#: rpmdb/rpmdb.c:1986 rpmdb/rpmdb.c:3386 +#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007 +#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787 #, c-format -msgid "record number %u in database is bad -- skipping.\n" -msgstr "ÚÁÐÉÓØ ÎÏÍÅÒ %u × ÂÁÚÅ ÄÁÎÎÙÈ ÎÅ×ÅÒÎÁ, ÐÒÏÐÕÓËÁÅÔÓÑ.\n" +msgid "error(%d) getting \"%s\" records from %s index\n" +msgstr "ÏÛÉÂËÁ(%d) ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n" -#: rpmdb/rpmdb.c:2052 +#: rpmdb/rpmdb.c:1930 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "rpmdb: ÐÏÌÕÞÅÎ ÐÏ×ÒÅÖÄÅÎÎÙÊ ÚÁÇÏÌÏ×ÏË #%u, ÐÒÏÐÕÓËÁÅÔÓÑ.\n" -#: rpmdb/rpmdb.c:2326 +#: rpmdb/rpmdb.c:2189 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ ÚÁÇÏÌÏ×ÏË × 0x%x\n" -#: rpmdb/rpmdb.c:2495 +#: rpmdb/rpmdb.c:2354 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "ÕÄÁÌÑÅÔÓÑ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s.\n" -#: rpmdb/rpmdb.c:2499 +#: rpmdb/rpmdb.c:2358 #, c-format msgid "removing %d entries from %s index.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ ÉÚ ÉÎÄÅËÓÁ %s.\n" -#: rpmdb/rpmdb.c:2692 +#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803 +#, c-format +msgid "error(%d) storing record %s into %s\n" +msgstr "ÏÛÉÂËÁ(%d) ÚÁÐÉÓÉ ÚÁÐÉÓÉ %s × %s\n" + +#: rpmdb/rpmdb.c:2416 +#, c-format +msgid "error(%d) removing record %s from %s\n" +msgstr "ÏÛÉÂËÁ(%d) ÕÄÁÌÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s\n" + +#: rpmdb/rpmdb.c:2557 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "ÏÛÉÂËÁ(%d) ÒÅÚÅÒ×ÉÒÏ×ÁÎÉÑ ÐÁÍÑÔÉ ÄÌÑ ÏÂÒÁÚÁ ÎÏ×ÏÇÏ ÐÁËÅÔÁ\n" -#: rpmdb/rpmdb.c:2887 +#: rpmdb/rpmdb.c:2763 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ \"%s\" × ÉÎÄÅËÓ %s.\n" -#: rpmdb/rpmdb.c:2891 +#: rpmdb/rpmdb.c:2767 #, c-format msgid "adding %d entries to %s index.\n" msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ × ÉÎÄÅËÓ %s\n" -#: rpmdb/rpmdb.c:3272 +#: rpmdb/rpmdb.c:3137 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s ÐÏÓÌÅ ÕÓÐÅÛÎÏÇÏ ÚÁ×ÅÒÛÅÎÉÑ ÐÅÒÅÉÎÄÅËÁÃÉÉ ÂÁÚÙ × db3.\n" -#: rpmdb/rpmdb.c:3305 +#: rpmdb/rpmdb.c:3172 msgid "no dbpath has been set" msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: rpmdb/rpmdb.c:3332 +#: rpmdb/rpmdb.c:3199 #, c-format msgid "rebuilding database %s into %s\n" msgstr "ÐÅÒÅÓÔÒÁÉ×ÁÅÔÓÑ ÂÁÚÁ ÄÁÎÎÙÈ %s × %s\n" -#: rpmdb/rpmdb.c:3336 +#: rpmdb/rpmdb.c:3203 #, c-format msgid "temporary database %s already exists\n" msgstr "×ÒÅÍÅÎÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ\n" -#: rpmdb/rpmdb.c:3342 +#: rpmdb/rpmdb.c:3209 #, c-format msgid "creating directory %s\n" msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: rpmdb/rpmdb.c:3344 +#: rpmdb/rpmdb.c:3211 #, c-format msgid "creating directory %s: %s\n" msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s: %s\n" -#: rpmdb/rpmdb.c:3351 +#: rpmdb/rpmdb.c:3218 #, c-format msgid "opening old database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3229 #, c-format msgid "opening new database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÎÏ×ÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3253 +#, c-format +msgid "record number %u in database is bad -- skipping.\n" +msgstr "ÚÁÐÉÓØ ÎÏÍÅÒ %u × ÂÁÚÅ ÄÁÎÎÙÈ ÎÅ×ÅÒÎÁ, ÐÒÏÐÕÓËÁÅÔÓÑ.\n" + +#: rpmdb/rpmdb.c:3293 #, c-format msgid "cannot add record originally at %u\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÚÁÐÉÓØ (ÐÅÒ×ÏÎÁÞÁÌØÎÏ × %u)\n" -#: rpmdb/rpmdb.c:3444 +#: rpmdb/rpmdb.c:3311 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "ÐÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n" -#: rpmdb/rpmdb.c:3452 +#: rpmdb/rpmdb.c:3319 msgid "failed to replace old database with new database!\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÍÅÎÉÔØ ÓÔÁÒÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÎÁ ÎÏ×ÕÀ!\n" -#: rpmdb/rpmdb.c:3454 +#: rpmdb/rpmdb.c:3321 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "ÆÁÊÌÙ × %s ÚÁÍÅÎÑÀÔÓÑ ÆÁÊÌÁÍÉ ÉÚ %s ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ" -#: rpmdb/rpmdb.c:3464 +#: rpmdb/rpmdb.c:3331 #, c-format msgid "removing directory %s\n" msgstr "ÕÄÁÌÑÅÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: rpmdb/rpmdb.c:3466 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n" @@ -3417,6 +3373,32 @@ msgid "failed to create %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n" #~ msgid "" +#~ "Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" +#~ msgstr "" +#~ "ãÅÐÏÞËÁ ÐÁËÅÔÏ× ÏÂÏÒ×ÁÎÁ ÎÁ ÓÍÅÝÅÎÉÉ %d(0x%08x), ÐÏÐÙÔËÁ ÓÏÅÄÉÎÅÎÉÑ...\n" + +#~ msgid "Reconnecting broken chain at offset %d(0x%08x).\n" +#~ msgstr "óÏÅÄÉÎÑÅÔÓÑ ÏÂÏÒ×ÁÎÎÁÑ Ó×ÑÚØ × ÓÍÅÝÅÎÉÉ %d(0x%08x).\n" + +#~ msgid "closed db file %s\n" +#~ msgstr "ÚÁËÒÙÔ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n" + +#~ msgid "removed db file %s\n" +#~ msgstr "ÕÄẠ́ΠÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n" + +#~ msgid "bad db file %s\n" +#~ msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n" + +#~ msgid "opening db file %s mode 0x%x\n" +#~ msgstr "ÏÔËÒÙ×ÅÔÓÑ ÆÁÊÌ %s ÂÁÚÙ ÄÁÎÎÙÈ × ÒÅÖÉÍÅ 0x%x\n" + +#~ msgid "cannot get %s lock on database\n" +#~ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÂÌÏËÉÒÏ×ËÕ %s ÂÁÚÙ ÄÁÎÎÙÈ\n" + +#~ msgid "error(%d) counting packages\n" +#~ msgstr "ÏÛÉÂËÁ(%d) ÐÒÉ ÐÏÄÓÞ£ÔÅ ÐÁËÅÔÏ×\n" + +#~ msgid "" #~ "free list corrupt (%u)- please run\n" #~ "\t\"rpm --rebuilddb\"\n" #~ "More information is available from http://www.rpm.org or the rpm-" diff --git a/po/sk.po b/po/sk.po index 7e9a27a..e80d818 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-02 19:33-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -1539,7 +1539,7 @@ msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 +#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028 msgid "(not a number)" msgstr "(nie je èíslo)" @@ -2903,62 +2903,16 @@ msgstr "Nevyrie msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:85 +#: rpmdb/db3.c:85 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:88 +#: rpmdb/db3.c:88 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db1.c:168 -#, c-format -msgid "" -"Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" -msgstr "" - -#: rpmdb/db1.c:180 -#, c-format -msgid "Reconnecting broken chain at offset %d(0x%08x).\n" -msgstr "" - -#. @=branchstate@ -#: rpmdb/db1.c:506 -#, c-format -msgid "closed db file %s\n" -msgstr "" - -#: rpmdb/db1.c:509 -#, fuzzy, c-format -msgid "removed db file %s\n" -msgstr "odstraòuje sa index súborov pre %s\n" - -#: rpmdb/db1.c:544 -#, fuzzy, c-format -msgid "bad db file %s\n" -msgstr "chybný stav súboru: %s" - -#: rpmdb/db1.c:549 -#, fuzzy, c-format -msgid "opening db file %s mode 0x%x\n" -msgstr "otvára sa databáza s právami 0x%x v %s\n" - -#. XXX check errno validity -#: rpmdb/db1.c:572 -#, fuzzy, c-format -msgid "cannot get %s lock on database\n" -msgstr "nie je mo¾né získa» %s zámok pre databázu" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "exclusive" -msgstr "výhradný" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "shared" -msgstr "zdieµaný" - #: rpmdb/db3.c:114 #, fuzzy, c-format msgid "closed db environment %s/%s\n" @@ -2974,27 +2928,35 @@ msgstr "odstra msgid "opening db environment %s/%s %s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: rpmdb/db3.c:561 +#: rpmdb/db3.c:605 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: rpmdb/db3.c:628 +#: rpmdb/db3.c:672 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" -#: rpmdb/db3.c:850 +#: rpmdb/db3.c:894 #, 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:1066 +#: rpmdb/db3.c:1110 #, 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:1072 +#: rpmdb/db3.c:1112 +msgid "exclusive" +msgstr "výhradný" + +#: rpmdb/db3.c:1112 +msgid "shared" +msgstr "zdieµaný" + +#: rpmdb/db3.c:1116 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "odstraòuje sa index súborov pre %s\n" @@ -3027,72 +2989,72 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabData() RPM_STRING_TYPE poèet musí by» 1.\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2208 +#: rpmdb/header.c:2210 msgid "missing { after %" msgstr "chýbajúce { po %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2238 +#: rpmdb/header.c:2240 msgid "missing } after %{" msgstr "chýbajúce } po %{" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2254 msgid "empty tag format" msgstr "prázdny tag formát" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2268 msgid "empty tag name" msgstr "prázdne meno tagu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2283 +#: rpmdb/header.c:2285 msgid "unknown tag" msgstr "neznámy tag" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2310 +#: rpmdb/header.c:2312 msgid "] expected at end of array" msgstr "] oèakávané na konci poµa" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2330 msgid "unexpected ]" msgstr "neoèakávané ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2332 +#: rpmdb/header.c:2334 msgid "unexpected }" msgstr "neoèakávané }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2398 +#: rpmdb/header.c:2401 msgid "? expected in expression" msgstr "? oèakávané vo výraze" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2407 +#: rpmdb/header.c:2410 msgid "{ expected after ? in expression" msgstr "{ oèakávané po ? vo výraze" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2420 rpmdb/header.c:2462 +#: rpmdb/header.c:2423 rpmdb/header.c:2468 msgid "} expected in expression" msgstr "} oèakávané vo výraze" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2430 +#: rpmdb/header.c:2433 msgid ": expected following ? subexpression" msgstr ": oèakávané po ? podvýraze" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2447 +#: rpmdb/header.c:2453 msgid "{ expected after : in expression" msgstr "{ oèakávané po : vo výraze" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2472 +#: rpmdb/header.c:2478 msgid "| expected at end of expression" msgstr "| oèakávené na konci výrazu" @@ -3115,151 +3077,146 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:161 +#: rpmdb/rpmdb.c:162 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:254 +#: rpmdb/rpmdb.c:234 #, 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:276 +#: rpmdb/rpmdb.c:256 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "nie je mo¾né otvori» %s\n" -#: rpmdb/rpmdb.c:377 -#, fuzzy, c-format -msgid "error(%d) getting \"%s\" records from %s index\n" -msgstr "chyba pri naèítaní záznamu %s z %s" - -#: rpmdb/rpmdb.c:518 -#, 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:538 -#, 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:797 +#: rpmdb/rpmdb.c:695 #, fuzzy msgid "no dbpath has been set\n" msgstr "nebola nastavená ¾iadna dbpath" -#. error -#: rpmdb/rpmdb.c:1183 -#, fuzzy, c-format -msgid "error(%d) counting packages\n" -msgstr "chyba pri hµadaní balíka %s\n" - -#: rpmdb/rpmdb.c:1986 rpmdb/rpmdb.c:3386 +#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007 +#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787 #, 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ý" +msgid "error(%d) getting \"%s\" records from %s index\n" +msgstr "chyba pri naèítaní záznamu %s z %s" -#: rpmdb/rpmdb.c:2052 +#: rpmdb/rpmdb.c:1930 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2326 +#: rpmdb/rpmdb.c:2189 #, 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:2495 +#: rpmdb/rpmdb.c:2354 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstraòuje sa index skupín\n" -#: rpmdb/rpmdb.c:2499 +#: rpmdb/rpmdb.c:2358 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstraòuje sa index názvov\n" -#: rpmdb/rpmdb.c:2692 +#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803 +#, 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:2416 +#, 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:2557 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "chyba pri hµadaní balíka %s\n" -#: rpmdb/rpmdb.c:2887 +#: rpmdb/rpmdb.c:2763 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "premenováva sa %s na %s\n" -#: rpmdb/rpmdb.c:2891 +#: rpmdb/rpmdb.c:2767 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "premenováva sa %s na %s\n" -#: rpmdb/rpmdb.c:3272 +#: rpmdb/rpmdb.c:3137 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3305 +#: rpmdb/rpmdb.c:3172 msgid "no dbpath has been set" msgstr "nebola nastavená ¾iadna dbpath" -#: rpmdb/rpmdb.c:3332 +#: rpmdb/rpmdb.c:3199 #, 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:3336 +#: rpmdb/rpmdb.c:3203 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "doèasná databáza %s u¾ existuje" -#: rpmdb/rpmdb.c:3342 +#: rpmdb/rpmdb.c:3209 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3344 +#: rpmdb/rpmdb.c:3211 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3351 +#: rpmdb/rpmdb.c:3218 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "otvára sa stará databáza\n" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3229 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "otvára sa nová databáza\n" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3253 +#, 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:3293 #, 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:3444 +#: rpmdb/rpmdb.c:3311 #, 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:3452 +#: rpmdb/rpmdb.c:3319 msgid "failed to replace old database with new database!\n" msgstr "nepodarilo sa nahradi» starú databázu novou!\n" -#: rpmdb/rpmdb.c:3454 +#: rpmdb/rpmdb.c:3321 #, 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:3464 +#: rpmdb/rpmdb.c:3331 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3466 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "nepodarilo sa odstráni» adresár %s: %s\n" @@ -3476,6 +3433,26 @@ msgid "failed to create %s: %s\n" msgstr "nepodarilo sa vytvori» %s\n" #, fuzzy +#~ msgid "removed db file %s\n" +#~ msgstr "odstraòuje sa index súborov pre %s\n" + +#, fuzzy +#~ msgid "bad db file %s\n" +#~ msgstr "chybný stav súboru: %s" + +#, fuzzy +#~ msgid "opening db file %s mode 0x%x\n" +#~ msgstr "otvára sa databáza s právami 0x%x v %s\n" + +#, fuzzy +#~ msgid "cannot get %s lock on database\n" +#~ msgstr "nie je mo¾né získa» %s zámok pre databázu" + +#, fuzzy +#~ msgid "error(%d) counting packages\n" +#~ msgstr "chyba pri hµadaní balíka %s\n" + +#, fuzzy #~ msgid "" #~ "old format database is present; use --rebuilddb to generate a new format " #~ "database\n" diff --git a/po/sl.po b/po/sl.po index a3dc716..9129136 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.241 2002/05/02 23:34:47 jbj Exp $ +# $Id: sl.po,v 1.242 2002/05/06 19:48:25 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-02 19:33-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -1541,7 +1541,7 @@ msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 +#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028 msgid "(not a number)" msgstr "(ni ¹tevilo)" @@ -2904,62 +2904,16 @@ msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: " msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:85 +#: rpmdb/db3.c:85 #, fuzzy, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "db%d napaka(%d)" -#: rpmdb/db1.c:101 rpmdb/db3.c:88 +#: rpmdb/db3.c:88 #, fuzzy, c-format msgid "db%d error(%d): %s\n" msgstr "db%d napaka(%d)" -#: rpmdb/db1.c:168 -#, c-format -msgid "" -"Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" -msgstr "" - -#: rpmdb/db1.c:180 -#, c-format -msgid "Reconnecting broken chain at offset %d(0x%08x).\n" -msgstr "" - -#. @=branchstate@ -#: rpmdb/db1.c:506 -#, c-format -msgid "closed db file %s\n" -msgstr "zaprta datoteka db %s\n" - -#: rpmdb/db1.c:509 -#, fuzzy, c-format -msgid "removed db file %s\n" -msgstr "odstranjena datoteka db %s\n" - -#: rpmdb/db1.c:544 -#, fuzzy, c-format -msgid "bad db file %s\n" -msgstr "po¹kodovana zbirka podatkov %s" - -#: rpmdb/db1.c:549 -#, fuzzy, c-format -msgid "opening db file %s mode 0x%x\n" -msgstr "odpiranje datoteke %s v naèinu 0x%x\n" - -#. XXX check errno validity -#: rpmdb/db1.c:572 -#, fuzzy, c-format -msgid "cannot get %s lock on database\n" -msgstr "datoteke ni mo¾no %s zakleniti" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "exclusive" -msgstr "izkljuèujoèe" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "shared" -msgstr "skupno" - #: rpmdb/db3.c:114 #, fuzzy, c-format msgid "closed db environment %s/%s\n" @@ -2975,27 +2929,35 @@ msgstr "odstranjeno db okolje %s/%s\n" msgid "opening db environment %s/%s %s\n" msgstr "odpiranje db okolja %s/%s %s\n" -#: rpmdb/db3.c:561 +#: rpmdb/db3.c:605 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "zaprto db kazalo %s/%s\n" -#: rpmdb/db3.c:628 +#: rpmdb/db3.c:672 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "zaprto db kazalo %s/%s\n" -#: rpmdb/db3.c:850 +#: rpmdb/db3.c:894 #, 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:1066 +#: rpmdb/db3.c:1110 #, 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:1072 +#: rpmdb/db3.c:1112 +msgid "exclusive" +msgstr "izkljuèujoèe" + +#: rpmdb/db3.c:1112 +msgid "shared" +msgstr "skupno" + +#: rpmdb/db3.c:1116 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "zaklenjeno db kazalo %s/%s\n" @@ -3030,72 +2992,72 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "¹tevec grabData() RPM_STRING_TYPE mora biti 1.\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2208 +#: rpmdb/header.c:2210 msgid "missing { after %" msgstr "manjkajoèi { za %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2238 +#: rpmdb/header.c:2240 msgid "missing } after %{" msgstr "manjkajoèi } za %{" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2254 msgid "empty tag format" msgstr "oblika znaèke manjka" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2268 msgid "empty tag name" msgstr "ime znaèke manjka" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2283 +#: rpmdb/header.c:2285 msgid "unknown tag" msgstr "neznana znaèka" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2310 +#: rpmdb/header.c:2312 msgid "] expected at end of array" msgstr "na koncu polja je prièakovan ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2330 msgid "unexpected ]" msgstr "neprièakovan ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2332 +#: rpmdb/header.c:2334 msgid "unexpected }" msgstr "neprièakovan }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2398 +#: rpmdb/header.c:2401 msgid "? expected in expression" msgstr "v izrazu je prièakovan ?" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2407 +#: rpmdb/header.c:2410 msgid "{ expected after ? in expression" msgstr "v izrazu je za { prièakovan ?" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2420 rpmdb/header.c:2462 +#: rpmdb/header.c:2423 rpmdb/header.c:2468 msgid "} expected in expression" msgstr "v izrazu je prièakovan }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2430 +#: rpmdb/header.c:2433 msgid ": expected following ? subexpression" msgstr "za podizrazom ? je prièakovano :" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2447 +#: rpmdb/header.c:2453 msgid "{ expected after : in expression" msgstr "v izrazu je za : prièakovan {" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2472 +#: rpmdb/header.c:2478 msgid "| expected at end of expression" msgstr "na koncu izraza je prièakovan |" @@ -3118,153 +3080,148 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:161 +#: rpmdb/rpmdb.c:162 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: neprepoznano ime znaèke: \"%s\" prezrto\n" -#: rpmdb/rpmdb.c:254 +#: rpmdb/rpmdb.c:234 #, 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:276 +#: rpmdb/rpmdb.c:256 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "ni mo¾no odpreti kazala %s:" -#: rpmdb/rpmdb.c:377 -#, fuzzy, c-format -msgid "error(%d) getting \"%s\" records from %s index\n" -msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s" - -#: rpmdb/rpmdb.c:518 -#, fuzzy, c-format -msgid "error(%d) storing record %s into %s\n" -msgstr "napaka(%d) pri pisanju zapisa %s v %s" - -#: rpmdb/rpmdb.c:538 -#, fuzzy, c-format -msgid "error(%d) removing record %s from %s\n" -msgstr "napaka(%d) pri brisanju zapisa %s iz %s" - -#: rpmdb/rpmdb.c:797 +#: rpmdb/rpmdb.c:695 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath ni nastavljena" -#. error -#: rpmdb/rpmdb.c:1183 -#, fuzzy, c-format -msgid "error(%d) counting packages\n" -msgstr "napaka(%d) pri ¹tetju paketov" - -#: rpmdb/rpmdb.c:1986 rpmdb/rpmdb.c:3386 +#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007 +#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787 #, fuzzy, c-format -msgid "record number %u in database is bad -- skipping.\n" -msgstr "zapis ¹t. %d v zbirki je po¹kodovan -- preskoèeno." +msgid "error(%d) getting \"%s\" records from %s index\n" +msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s" -#: rpmdb/rpmdb.c:2052 +#: rpmdb/rpmdb.c:1930 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2326 +#: rpmdb/rpmdb.c:2189 #, 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:2495 +#: rpmdb/rpmdb.c:2354 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstranjevanje \"%s\" iz kazala %s.\n" -#: rpmdb/rpmdb.c:2499 +#: rpmdb/rpmdb.c:2358 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstranjevanje %d vnosov iz kazala %s\n" -#: rpmdb/rpmdb.c:2692 +#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803 +#, fuzzy, c-format +msgid "error(%d) storing record %s into %s\n" +msgstr "napaka(%d) pri pisanju zapisa %s v %s" + +#: rpmdb/rpmdb.c:2416 +#, fuzzy, c-format +msgid "error(%d) removing record %s from %s\n" +msgstr "napaka(%d) pri brisanju zapisa %s iz %s" + +#: rpmdb/rpmdb.c:2557 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "napaka(%d) pri iskanju paketa %s\n" -#: rpmdb/rpmdb.c:2887 +#: rpmdb/rpmdb.c:2763 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "dodajanje \"%s\" v kazalo %s.\n" -#: rpmdb/rpmdb.c:2891 +#: rpmdb/rpmdb.c:2767 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "dodajanje %d vnosov v kazalo %s.\n" -#: rpmdb/rpmdb.c:3272 +#: rpmdb/rpmdb.c:3137 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3305 +#: rpmdb/rpmdb.c:3172 msgid "no dbpath has been set" msgstr "dbpath ni nastavljena" -#: rpmdb/rpmdb.c:3332 +#: rpmdb/rpmdb.c:3199 #, c-format msgid "rebuilding database %s into %s\n" msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n" -#: rpmdb/rpmdb.c:3336 +#: rpmdb/rpmdb.c:3203 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "zaèasna podatkovna zbirka %s ¾e obstaja" -#: rpmdb/rpmdb.c:3342 +#: rpmdb/rpmdb.c:3209 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "ustvarjanje imenika: %s\n" -#: rpmdb/rpmdb.c:3344 +#: rpmdb/rpmdb.c:3211 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "ustvarjanje imenika: %s\n" -#: rpmdb/rpmdb.c:3351 +#: rpmdb/rpmdb.c:3218 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "odpiranje stare podatkovne zbirke\n" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3229 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "odpiramo nove podatkovne zbirke z dbapi %d\n" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3253 +#, 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:3293 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "zapisa ni mo¾no dodati na %d" -#: rpmdb/rpmdb.c:3444 +#: rpmdb/rpmdb.c:3311 #, 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:3452 +#: rpmdb/rpmdb.c:3319 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:3454 +#: rpmdb/rpmdb.c:3321 #, 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:3464 +#: rpmdb/rpmdb.c:3331 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "odstranjevanje imenika: %s\n" -#: rpmdb/rpmdb.c:3466 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspe¹na odstranitev imenika %s: %s\n" @@ -3480,6 +3437,29 @@ msgstr "vrata URL morajo biti msgid "failed to create %s: %s\n" msgstr "neuspe¹no ustvarjanje %s: %s\n" +#~ msgid "closed db file %s\n" +#~ msgstr "zaprta datoteka db %s\n" + +#, fuzzy +#~ msgid "removed db file %s\n" +#~ msgstr "odstranjena datoteka db %s\n" + +#, fuzzy +#~ msgid "bad db file %s\n" +#~ msgstr "po¹kodovana zbirka podatkov %s" + +#, fuzzy +#~ msgid "opening db file %s mode 0x%x\n" +#~ msgstr "odpiranje datoteke %s v naèinu 0x%x\n" + +#, fuzzy +#~ msgid "cannot get %s lock on database\n" +#~ msgstr "datoteke ni mo¾no %s zakleniti" + +#, fuzzy +#~ msgid "error(%d) counting packages\n" +#~ msgstr "napaka(%d) pri ¹tetju paketov" + #~ msgid "" #~ "free list corrupt (%u)- please run\n" #~ "\t\"rpm --rebuilddb\"\n" diff --git a/po/sr.po b/po/sr.po index 7023d25..a80c568 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-02 19:33-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" @@ -1528,7 +1528,7 @@ msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 +#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028 msgid "(not a number)" msgstr "(nije broj)" @@ -2899,62 +2899,16 @@ msgstr "Nezadovoljene me msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "" -#: rpmdb/db1.c:98 rpmdb/db3.c:85 +#: rpmdb/db3.c:85 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "" -#: rpmdb/db1.c:101 rpmdb/db3.c:88 +#: rpmdb/db3.c:88 #, c-format msgid "db%d error(%d): %s\n" msgstr "" -#: rpmdb/db1.c:168 -#, c-format -msgid "" -"Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" -msgstr "" - -#: rpmdb/db1.c:180 -#, c-format -msgid "Reconnecting broken chain at offset %d(0x%08x).\n" -msgstr "" - -#. @=branchstate@ -#: rpmdb/db1.c:506 -#, c-format -msgid "closed db file %s\n" -msgstr "" - -#: rpmdb/db1.c:509 -#, c-format -msgid "removed db file %s\n" -msgstr "" - -#: rpmdb/db1.c:544 -#, fuzzy, c-format -msgid "bad db file %s\n" -msgstr "neuspelo otvaranje %s: %s" - -#: rpmdb/db1.c:549 -#, fuzzy, c-format -msgid "opening db file %s mode 0x%x\n" -msgstr "rekreiraj bazu podataka iz postojeæe baze" - -#. XXX check errno validity -#: rpmdb/db1.c:572 -#, fuzzy, c-format -msgid "cannot get %s lock on database\n" -msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "exclusive" -msgstr "ekskluzivno" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "shared" -msgstr "deljeno" - #: rpmdb/db3.c:114 #, c-format msgid "closed db environment %s/%s\n" @@ -2970,27 +2924,35 @@ msgstr "" msgid "opening db environment %s/%s %s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/db3.c:561 +#: rpmdb/db3.c:605 #, fuzzy, c-format msgid "closed db index %s/%s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/db3.c:628 +#: rpmdb/db3.c:672 #, fuzzy, c-format msgid "verified db index %s/%s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/db3.c:850 +#: rpmdb/db3.c:894 #, 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:1066 +#: rpmdb/db3.c:1110 #, 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:1072 +#: rpmdb/db3.c:1112 +msgid "exclusive" +msgstr "ekskluzivno" + +#: rpmdb/db3.c:1112 +msgid "shared" +msgstr "deljeno" + +#: rpmdb/db3.c:1116 #, fuzzy, c-format msgid "locked db index %s/%s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" @@ -3022,74 +2984,74 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2208 +#: rpmdb/header.c:2210 msgid "missing { after %" msgstr "nedostaje { posle %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2238 +#: rpmdb/header.c:2240 msgid "missing } after %{" msgstr "nedostaje } posle %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2254 msgid "empty tag format" msgstr "prazan 'tag' format'" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2268 msgid "empty tag name" msgstr "prazno ime tag-a" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2283 +#: rpmdb/header.c:2285 msgid "unknown tag" msgstr "nepoznat tag" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2310 +#: rpmdb/header.c:2312 msgid "] expected at end of array" msgstr "] oèekivano na kraju niza" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2330 msgid "unexpected ]" msgstr "neoèekivano ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2332 +#: rpmdb/header.c:2334 msgid "unexpected }" msgstr "neoèekivano }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2398 +#: rpmdb/header.c:2401 msgid "? expected in expression" msgstr "oèekivan znak ? u izrazu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2407 +#: rpmdb/header.c:2410 #, fuzzy msgid "{ expected after ? in expression" msgstr "{ oèekivano posle ? u izrazu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2420 rpmdb/header.c:2462 +#: rpmdb/header.c:2423 rpmdb/header.c:2468 msgid "} expected in expression" msgstr "} oèekivano u izrazu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2430 +#: rpmdb/header.c:2433 msgid ": expected following ? subexpression" msgstr "oèekivano : praæeno ? podizrazom" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2447 +#: rpmdb/header.c:2453 #, fuzzy msgid "{ expected after : in expression" msgstr "{ oèekivano posle : u izrazu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2472 +#: rpmdb/header.c:2478 msgid "| expected at end of expression" msgstr "| oèekivano na kraju izraza" @@ -3112,150 +3074,145 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "" #. @-modfilesys@ -#: rpmdb/rpmdb.c:161 +#: rpmdb/rpmdb.c:162 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "" -#: rpmdb/rpmdb.c:254 +#: rpmdb/rpmdb.c:234 #, fuzzy, c-format msgid "cannot open %s index using db%d - %s (%d)\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: rpmdb/rpmdb.c:276 +#: rpmdb/rpmdb.c:256 #, fuzzy, c-format msgid "cannot open %s index\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: rpmdb/rpmdb.c:377 -#, fuzzy, c-format -msgid "error(%d) getting \"%s\" records from %s index\n" -msgstr "gre¹ka kod uzimanja sloga %s iz %s" - -#: rpmdb/rpmdb.c:518 -#, fuzzy, c-format -msgid "error(%d) storing record %s into %s\n" -msgstr "gre¹ka zapisivanja sloga %s u %s" - -#: rpmdb/rpmdb.c:538 -#, fuzzy, c-format -msgid "error(%d) removing record %s from %s\n" -msgstr "gre¹ka uklanjanja sloga %s u %s" - -#: rpmdb/rpmdb.c:797 +#: rpmdb/rpmdb.c:695 #, fuzzy msgid "no dbpath has been set\n" msgstr "dbpath nije odreðen" -#. error -#: rpmdb/rpmdb.c:1183 +#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007 +#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787 #, fuzzy, c-format -msgid "error(%d) counting packages\n" -msgstr "gre¹ka kod potrage za paketom %s\n" - -#: rpmdb/rpmdb.c:1986 rpmdb/rpmdb.c:3386 -#, 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" +msgid "error(%d) getting \"%s\" records from %s index\n" +msgstr "gre¹ka kod uzimanja sloga %s iz %s" -#: rpmdb/rpmdb.c:2052 +#: rpmdb/rpmdb.c:1930 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "" -#: rpmdb/rpmdb.c:2326 +#: rpmdb/rpmdb.c:2189 #, 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:2495 +#: rpmdb/rpmdb.c:2354 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2499 +#: rpmdb/rpmdb.c:2358 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2692 +#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803 +#, fuzzy, c-format +msgid "error(%d) storing record %s into %s\n" +msgstr "gre¹ka zapisivanja sloga %s u %s" + +#: rpmdb/rpmdb.c:2416 +#, fuzzy, c-format +msgid "error(%d) removing record %s from %s\n" +msgstr "gre¹ka uklanjanja sloga %s u %s" + +#: rpmdb/rpmdb.c:2557 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "gre¹ka kod potrage za paketom %s\n" -#: rpmdb/rpmdb.c:2887 +#: rpmdb/rpmdb.c:2763 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2891 +#: rpmdb/rpmdb.c:2767 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:3272 +#: rpmdb/rpmdb.c:3137 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3305 +#: rpmdb/rpmdb.c:3172 msgid "no dbpath has been set" msgstr "dbpath nije odreðen" -#: rpmdb/rpmdb.c:3332 +#: rpmdb/rpmdb.c:3199 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3336 +#: rpmdb/rpmdb.c:3203 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "privremena baza podataka %s veæ postoji" -#: rpmdb/rpmdb.c:3342 +#: rpmdb/rpmdb.c:3209 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3344 +#: rpmdb/rpmdb.c:3211 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3351 +#: rpmdb/rpmdb.c:3218 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3229 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3253 +#, 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:3293 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "ne mogu da dodam slog originalno na %d" -#: rpmdb/rpmdb.c:3444 +#: rpmdb/rpmdb.c:3311 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3452 +#: rpmdb/rpmdb.c:3319 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3454 +#: rpmdb/rpmdb.c:3321 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3464 +#: rpmdb/rpmdb.c:3331 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3466 +#: rpmdb/rpmdb.c:3333 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspelo otvaranje %s: %s" @@ -3479,6 +3436,22 @@ msgid "failed to create %s: %s\n" msgstr "neuspelo kreiranje %s\n" #, fuzzy +#~ msgid "bad db file %s\n" +#~ msgstr "neuspelo otvaranje %s: %s" + +#, fuzzy +#~ msgid "opening db file %s mode 0x%x\n" +#~ msgstr "rekreiraj bazu podataka iz postojeæe baze" + +#, fuzzy +#~ msgid "cannot get %s lock on database\n" +#~ msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka" + +#, fuzzy +#~ msgid "error(%d) counting packages\n" +#~ msgstr "gre¹ka kod potrage za paketom %s\n" + +#, fuzzy #~ msgid "don't verify signature(s)" #~ msgstr "instaliraj paket" diff --git a/po/sv.po b/po/sv.po index da0a52d..471e94c 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-02 19:33-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 2001-09-12 14:18+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -1505,7 +1505,7 @@ msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 +#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028 msgid "(not a number)" msgstr "(inte ett tal)" @@ -2833,62 +2833,16 @@ msgstr "Ouppfyllda beroenden f msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "%s-%s-%s: kontrollsumma för oföränderlig huvudregion misslyckades\n" -#: rpmdb/db1.c:98 rpmdb/db3.c:85 +#: rpmdb/db3.c:85 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "db%d-fel(%d) från %s: %s\n" -#: rpmdb/db1.c:101 rpmdb/db3.c:88 +#: rpmdb/db3.c:88 #, c-format msgid "db%d error(%d): %s\n" msgstr "db%d-fel(%d): %s\n" -#: rpmdb/db1.c:168 -#, c-format -msgid "" -"Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" -msgstr "Trasig paketkedja vid %d(0x%08x), försöker återansluta ...\n" - -#: rpmdb/db1.c:180 -#, c-format -msgid "Reconnecting broken chain at offset %d(0x%08x).\n" -msgstr "Återansluter trasig kedja vid %d(0x%08x).\n" - -#. @=branchstate@ -#: rpmdb/db1.c:506 -#, c-format -msgid "closed db file %s\n" -msgstr "stängde db-fil %s\n" - -#: rpmdb/db1.c:509 -#, c-format -msgid "removed db file %s\n" -msgstr "tog bort db-fil %s\n" - -#: rpmdb/db1.c:544 -#, c-format -msgid "bad db file %s\n" -msgstr "felaktig db-fil %s\n" - -#: rpmdb/db1.c:549 -#, c-format -msgid "opening db file %s mode 0x%x\n" -msgstr "öppnar db-fil %s rättighet 0x%x\n" - -#. XXX check errno validity -#: rpmdb/db1.c:572 -#, c-format -msgid "cannot get %s lock on database\n" -msgstr "kan inte få %s lås på databas\n" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "exclusive" -msgstr "uteslutande" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "shared" -msgstr "delat" - #: rpmdb/db3.c:114 #, c-format msgid "closed db environment %s/%s\n" @@ -2904,27 +2858,35 @@ msgstr "tog bort db-milj msgid "opening db environment %s/%s %s\n" msgstr "öppnar db-miljö %s/%s %s\n" -#: rpmdb/db3.c:561 +#: rpmdb/db3.c:605 #, c-format msgid "closed db index %s/%s\n" msgstr "stängde db-index %s/%s\n" -#: rpmdb/db3.c:628 +#: rpmdb/db3.c:672 #, c-format msgid "verified db index %s/%s\n" msgstr "verifierade db-index %s/%s\n" -#: rpmdb/db3.c:850 +#: rpmdb/db3.c:894 #, 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:1066 +#: rpmdb/db3.c:1110 #, 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:1072 +#: rpmdb/db3.c:1112 +msgid "exclusive" +msgstr "uteslutande" + +#: rpmdb/db3.c:1112 +msgid "shared" +msgstr "delat" + +#: rpmdb/db3.c:1116 #, c-format msgid "locked db index %s/%s\n" msgstr "låste db-index %s/%s\n" @@ -2956,72 +2918,72 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE antal måste vara 1.\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2208 +#: rpmdb/header.c:2210 msgid "missing { after %" msgstr "{ fattas efter %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2238 +#: rpmdb/header.c:2240 msgid "missing } after %{" msgstr "} fattas efter %{" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2254 msgid "empty tag format" msgstr "tomt taggformat" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2268 msgid "empty tag name" msgstr "tomt taggnamn" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2283 +#: rpmdb/header.c:2285 msgid "unknown tag" msgstr "okänd tagg" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2310 +#: rpmdb/header.c:2312 msgid "] expected at end of array" msgstr "] förväntades vid slutet på vektor" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2330 msgid "unexpected ]" msgstr "oväntad ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2332 +#: rpmdb/header.c:2334 msgid "unexpected }" msgstr "oväntad }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2398 +#: rpmdb/header.c:2401 msgid "? expected in expression" msgstr "? förväntades i uttryck" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2407 +#: rpmdb/header.c:2410 msgid "{ expected after ? in expression" msgstr "{ förväntades efter ? i uttryck" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2420 rpmdb/header.c:2462 +#: rpmdb/header.c:2423 rpmdb/header.c:2468 msgid "} expected in expression" msgstr "} förväntades i uttryck" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2430 +#: rpmdb/header.c:2433 msgid ": expected following ? subexpression" msgstr ": förväntades efter ? i deluttryck" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2447 +#: rpmdb/header.c:2453 msgid "{ expected after : in expression" msgstr "{ förväntades efter : i uttryck" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2472 +#: rpmdb/header.c:2478 msgid "| expected at end of expression" msgstr "| förväntades vid slutet på uttryck" @@ -3042,149 +3004,144 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "generera huvuden kompatibla med (äldre) rpm[23]-paketering" #. @-modfilesys@ -#: rpmdb/rpmdb.c:161 +#: rpmdb/rpmdb.c:162 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: okänt taggnamn: \"%s\" ignorerat\n" -#: rpmdb/rpmdb.c:254 +#: rpmdb/rpmdb.c:234 #, 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:276 +#: rpmdb/rpmdb.c:256 #, c-format msgid "cannot open %s index\n" msgstr "kan inte öppna %s-indexet\n" -#: rpmdb/rpmdb.c:377 -#, 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" - -#: rpmdb/rpmdb.c:518 -#, 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:538 -#, 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:797 +#: rpmdb/rpmdb.c:695 msgid "no dbpath has been set\n" msgstr "ingen dbpath har satts\n" -#. error -#: rpmdb/rpmdb.c:1183 -#, c-format -msgid "error(%d) counting packages\n" -msgstr "fel(%d) när paket räknades\n" - -#: rpmdb/rpmdb.c:1986 rpmdb/rpmdb.c:3386 +#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007 +#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787 #, c-format -msgid "record number %u in database is bad -- skipping.\n" -msgstr "post nummer %u i databasen är felaktig -- hoppar över.\n" +msgid "error(%d) getting \"%s\" records from %s index\n" +msgstr "fel(%d) när \"%s\"-poster hämtades från %s-indexet\n" -#: rpmdb/rpmdb.c:2052 +#: rpmdb/rpmdb.c:1930 #, c-format msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n" msgstr "rpmdb: skadad huvudinstans #%u hämtad, hoppar över.\n" -#: rpmdb/rpmdb.c:2326 +#: rpmdb/rpmdb.c:2189 #, 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:2495 +#: rpmdb/rpmdb.c:2354 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "tar bort \"%s\" från %s-indexet.\n" -#: rpmdb/rpmdb.c:2499 +#: rpmdb/rpmdb.c:2358 #, c-format msgid "removing %d entries from %s index.\n" msgstr "tar bort %d poster från %s-indexet.\n" -#: rpmdb/rpmdb.c:2692 +#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803 +#, 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:2416 +#, 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:2557 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "fel(%d) vid allokering av ny paketinstans\n" -#: rpmdb/rpmdb.c:2887 +#: rpmdb/rpmdb.c:2763 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "lägger till \"%s\" till %s-indexet.\n" -#: rpmdb/rpmdb.c:2891 +#: rpmdb/rpmdb.c:2767 #, c-format msgid "adding %d entries to %s index.\n" msgstr "lägger till %d poster till %s-indexet.\n" -#: rpmdb/rpmdb.c:3272 +#: rpmdb/rpmdb.c:3137 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "tar bort %s efter lyckad db3-ombyggnad.\n" -#: rpmdb/rpmdb.c:3305 +#: rpmdb/rpmdb.c:3172 msgid "no dbpath has been set" msgstr "ingen dbpath har satts" -#: rpmdb/rpmdb.c:3332 +#: rpmdb/rpmdb.c:3199 #, c-format msgid "rebuilding database %s into %s\n" msgstr "bygger om databas %s till %s\n" -#: rpmdb/rpmdb.c:3336 +#: rpmdb/rpmdb.c:3203 #, c-format msgid "temporary database %s already exists\n" msgstr "tillfällig databas %s existerar redan\n" -#: rpmdb/rpmdb.c:3342 +#: rpmdb/rpmdb.c:3209 #, c-format msgid "creating directory %s\n" msgstr "skapar katalog %s\n" -#: rpmdb/rpmdb.c:3344 +#: rpmdb/rpmdb.c:3211 #, c-format msgid "creating directory %s: %s\n" msgstr "skapar katalog %s: %s\n" -#: rpmdb/rpmdb.c:3351 +#: rpmdb/rpmdb.c:3218 #, c-format msgid "opening old database with dbapi %d\n" msgstr "öppnar gammal databas med dbapi %d\n" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3229 #, c-format msgid "opening new database with dbapi %d\n" msgstr "öppnar ny databas med dbapi %d\n" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3253 +#, 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:3293 #, c-format msgid "cannot add record originally at %u\n" msgstr "kan inte lägga till post ursprungligen vid %u\n" -#: rpmdb/rpmdb.c:3444 +#: rpmdb/rpmdb.c:3311 msgid "failed to rebuild database: original database remains in place\n" msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n" -#: rpmdb/rpmdb.c:3452 +#: rpmdb/rpmdb.c:3319 msgid "failed to replace old database with new database!\n" msgstr "kunde inte ersätta gammal databas med ny databas!\n" -#: rpmdb/rpmdb.c:3454 +#: rpmdb/rpmdb.c:3321 #, 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:3464 +#: rpmdb/rpmdb.c:3331 #, c-format msgid "removing directory %s\n" msgstr "tar bort katalog %s\n" -#: rpmdb/rpmdb.c:3466 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunde inte ta bort katalogen %s: %s\n" @@ -3397,6 +3354,31 @@ msgid "failed to create %s: %s\n" msgstr "kunde inte skapa %s: %s\n" #~ msgid "" +#~ "Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" +#~ msgstr "Trasig paketkedja vid %d(0x%08x), försöker återansluta ...\n" + +#~ msgid "Reconnecting broken chain at offset %d(0x%08x).\n" +#~ msgstr "Återansluter trasig kedja vid %d(0x%08x).\n" + +#~ msgid "closed db file %s\n" +#~ msgstr "stängde db-fil %s\n" + +#~ msgid "removed db file %s\n" +#~ msgstr "tog bort db-fil %s\n" + +#~ msgid "bad db file %s\n" +#~ msgstr "felaktig db-fil %s\n" + +#~ msgid "opening db file %s mode 0x%x\n" +#~ msgstr "öppnar db-fil %s rättighet 0x%x\n" + +#~ msgid "cannot get %s lock on database\n" +#~ msgstr "kan inte få %s lås på databas\n" + +#~ msgid "error(%d) counting packages\n" +#~ msgstr "fel(%d) när paket räknades\n" + +#~ msgid "" #~ "free list corrupt (%u)- please run\n" #~ "\t\"rpm --rebuilddb\"\n" #~ "More information is available from http://www.rpm.org or the rpm-" diff --git a/po/tr.po b/po/tr.po index ce2c93d..16b9554 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-02 19:33-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -1525,7 +1525,7 @@ msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2979 rpmdb/header.c:3000 rpmdb/header.c:3022 +#: rpmdb/header.c:2985 rpmdb/header.c:3006 rpmdb/header.c:3028 msgid "(not a number)" msgstr "(bir sayý deðil)" @@ -2854,64 +2854,16 @@ msgstr "%s-%s-%s i msgid "%s-%s-%s: immutable header region digest check failed\n" msgstr "%s-%s-%s: deðiþmez baþlýk alaný özet denetimi baþarýsýz\n" -#: rpmdb/db1.c:98 rpmdb/db3.c:85 +#: rpmdb/db3.c:85 #, c-format msgid "db%d error(%d) from %s: %s\n" msgstr "db%d hata(%d) %s'den: %s\n" -#: rpmdb/db1.c:101 rpmdb/db3.c:88 +#: rpmdb/db3.c:88 #, c-format msgid "db%d error(%d): %s\n" msgstr "db%d hata(%d): %s\n" -#: rpmdb/db1.c:168 -#, c-format -msgid "" -"Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" -msgstr "" -"%d(0x%08x) göreli konumunda paket zinciri kopuk, yeniden baðlanmaya " -"çalýþýlýyor...\n" - -#: rpmdb/db1.c:180 -#, c-format -msgid "Reconnecting broken chain at offset %d(0x%08x).\n" -msgstr "%d(0x%08x) göreli konumunda kopan zincir yeniden baðlanýyor.\n" - -#. @=branchstate@ -#: rpmdb/db1.c:506 -#, c-format -msgid "closed db file %s\n" -msgstr "kapanan db dosyasý %s\n" - -#: rpmdb/db1.c:509 -#, c-format -msgid "removed db file %s\n" -msgstr "silinen db dosyasý %s\n" - -#: rpmdb/db1.c:544 -#, c-format -msgid "bad db file %s\n" -msgstr "db dosyasý %s hatalý\n" - -#: rpmdb/db1.c:549 -#, c-format -msgid "opening db file %s mode 0x%x\n" -msgstr "açýlan db dosyasý %s kip 0x%x\n" - -#. XXX check errno validity -#: rpmdb/db1.c:572 -#, c-format -msgid "cannot get %s lock on database\n" -msgstr "Veritabaný için %s kilit alýnamadý\n" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "exclusive" -msgstr "baðdaþýk" - -#: rpmdb/db1.c:573 rpmdb/db3.c:1068 -msgid "shared" -msgstr "paylaþýmlý" - #: rpmdb/db3.c:114 #, c-format msgid "closed db environment %s/%s\n" @@ -2927,27 +2879,35 @@ msgstr "silindi db ortam msgid "opening db environment %s/%s %s\n" msgstr "açýlýyor db ortamý %s/%s %s\n" -#: rpmdb/db3.c:561 +#: rpmdb/db3.c:605 #, c-format msgid "closed db index %s/%s\n" msgstr "kapandý db endeks %s/%s\n" -#: rpmdb/db3.c:628 +#: rpmdb/db3.c:672 #, c-format msgid "verified db index %s/%s\n" msgstr "doðrulandý db endeks %s/%s\n" -#: rpmdb/db3.c:850 +#: rpmdb/db3.c:894 #, 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:1066 +#: rpmdb/db3.c:1110 #, c-format msgid "cannot get %s lock on %s/%s\n" msgstr "%s kilit %s/%s'den alýnamadý\n" -#: rpmdb/db3.c:1072 +#: rpmdb/db3.c:1112 +msgid "exclusive" +msgstr "baðdaþýk" + +#: rpmdb/db3.c:1112 +msgid "shared" +msgstr "paylaþýmlý" + +#: rpmdb/db3.c:1116 #, c-format msgid "locked db index %s/%s\n" msgstr "kilitli db endeks %s/%s\n" @@ -2979,72 +2939,72 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE sayýsý 1 olmalý.\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2208 +#: rpmdb/header.c:2210 msgid "missing { after %" msgstr "%% den sonraki { yok" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2238 +#: rpmdb/header.c:2240 msgid "missing } after %{" msgstr "%%{ den sonraki } yok" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2254 msgid "empty tag format" msgstr "etiket biçemi boþ" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2268 msgid "empty tag name" msgstr "etiket ismi boþ" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2283 +#: rpmdb/header.c:2285 msgid "unknown tag" msgstr "bilinmeyen etiket" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2310 +#: rpmdb/header.c:2312 msgid "] expected at end of array" msgstr "dizinin sonunda ] gerekli" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2328 +#: rpmdb/header.c:2330 msgid "unexpected ]" msgstr "beklenmeyen ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2332 +#: rpmdb/header.c:2334 msgid "unexpected }" msgstr "beklenmeyen }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2398 +#: rpmdb/header.c:2401 msgid "? expected in expression" msgstr "ifade içerisinde ? gerekli" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2407 +#: rpmdb/header.c:2410 msgid "{ expected after ? in expression" msgstr "ifade içerisinde ? dan sonra { gerekli" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2420 rpmdb/header.c:2462 +#: rpmdb/header.c:2423 rpmdb/header.c:2468 msgid "} expected in expression" msgstr "ifade içinde } gerekli" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2430 +#: rpmdb/header.c:2433 msgid ": expected following ? subexpression" msgstr "? alt ifadesinden sonra : gerekli" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2447 +#: rpmdb/header.c:2453 msgid "{ expected after : in expression" msgstr "ifade içersinde : den sonra { gerekli" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2472 +#: rpmdb/header.c:2478 msgid "| expected at end of expression" msgstr "ifadenin sonunda | gerekli" @@ -3065,151 +3025,146 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging" msgstr "(eski) rpm[23] paketleme ile uyumlu baþlýklarý üretir" #. @-modfilesys@ -#: rpmdb/rpmdb.c:161 +#: rpmdb/rpmdb.c:162 #, c-format msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n" msgstr "dbiTagsInit: tanýmlanmamýþ etiket adý: \"%s\" yoksayýldý\n" -#: rpmdb/rpmdb.c:254 +#: rpmdb/rpmdb.c:234 #, 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:276 +#: rpmdb/rpmdb.c:256 #, c-format msgid "cannot open %s index\n" msgstr "%s indeksi açýlamadý\n" -#: rpmdb/rpmdb.c:377 -#, c-format -msgid "error(%d) getting \"%s\" records from %s index\n" -msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n" - -#: rpmdb/rpmdb.c:518 -#, 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:538 -#, 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:797 +#: rpmdb/rpmdb.c:695 msgid "no dbpath has been set\n" msgstr "belirtilmiþ bir dbpath deðeri yok\n" -#. error -#: rpmdb/rpmdb.c:1183 -#, c-format -msgid "error(%d) counting packages\n" -msgstr "paketler taranýrken hata(%d)\n" - -#: rpmdb/rpmdb.c:1986 rpmdb/rpmdb.c:3386 +#: rpmdb/rpmdb.c:983 rpmdb/rpmdb.c:1110 rpmdb/rpmdb.c:1157 rpmdb/rpmdb.c:2007 +#: rpmdb/rpmdb.c:2107 rpmdb/rpmdb.c:2385 rpmdb/rpmdb.c:2787 #, c-format -msgid "record number %u in database is bad -- skipping.\n" -msgstr "veritabanýndaki %u. kayýt hatalý -- atlanýyor\n" +msgid "error(%d) getting \"%s\" records from %s index\n" +msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n" -#: rpmdb/rpmdb.c:2052 +#: rpmdb/rpmdb.c:1930 #, 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:2326 +#: rpmdb/rpmdb.c:2189 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: 0x%x de baþlýk okunamadý\n" -#: rpmdb/rpmdb.c:2495 +#: rpmdb/rpmdb.c:2354 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "\"%s\" %s indeksinden siliniyor.\n" -#: rpmdb/rpmdb.c:2499 +#: rpmdb/rpmdb.c:2358 #, c-format msgid "removing %d entries from %s index.\n" msgstr "%d girdi %s indeksinden siliniyor.\n" -#: rpmdb/rpmdb.c:2692 +#: rpmdb/rpmdb.c:2406 rpmdb/rpmdb.c:2803 +#, 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:2416 +#, 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:2557 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "yeni paket örneðini tutma hatasý(%d)\n" -#: rpmdb/rpmdb.c:2887 +#: rpmdb/rpmdb.c:2763 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "\"%s\" %s indeksine ekleniyor.\n" -#: rpmdb/rpmdb.c:2891 +#: rpmdb/rpmdb.c:2767 #, c-format msgid "adding %d entries to %s index.\n" msgstr "%d girdi %s indeksine ekleniyor.\n" -#: rpmdb/rpmdb.c:3272 +#: rpmdb/rpmdb.c:3137 #, 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:3305 +#: rpmdb/rpmdb.c:3172 msgid "no dbpath has been set" msgstr "belirtilmiþ bir dbpath yok" -#: rpmdb/rpmdb.c:3332 +#: rpmdb/rpmdb.c:3199 #, c-format msgid "rebuilding database %s into %s\n" msgstr "%s veritabaný %s içinde yeniden oluþturuluyor\n" -#: rpmdb/rpmdb.c:3336 +#: rpmdb/rpmdb.c:3203 #, c-format msgid "temporary database %s already exists\n" msgstr "geçici veritabaný %s zaten mevcut\n" -#: rpmdb/rpmdb.c:3342 +#: rpmdb/rpmdb.c:3209 #, c-format msgid "creating directory %s\n" msgstr "%s dizini oluþturuluyor\n" -#: rpmdb/rpmdb.c:3344 +#: rpmdb/rpmdb.c:3211 #, c-format msgid "creating directory %s: %s\n" msgstr "%s dizini oluþturuluyor: %s\n" -#: rpmdb/rpmdb.c:3351 +#: rpmdb/rpmdb.c:3218 #, c-format msgid "opening old database with dbapi %d\n" msgstr "eski veritabaný dbapi %d ile açýlýyor\n" -#: rpmdb/rpmdb.c:3362 +#: rpmdb/rpmdb.c:3229 #, c-format msgid "opening new database with dbapi %d\n" msgstr "yeni veritabaný dbapi %d ile açýlýyor\n" -#: rpmdb/rpmdb.c:3426 +#: rpmdb/rpmdb.c:3253 +#, 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:3293 #, c-format msgid "cannot add record originally at %u\n" msgstr "kayýt özgün olarak %u e eklenemedi\n" -#: rpmdb/rpmdb.c:3444 +#: rpmdb/rpmdb.c:3311 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:3452 +#: rpmdb/rpmdb.c:3319 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:3454 +#: rpmdb/rpmdb.c:3321 #, 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:3464 +#: rpmdb/rpmdb.c:3331 #, c-format msgid "removing directory %s\n" msgstr "%s dizini siliniyor\n" -#: rpmdb/rpmdb.c:3466 +#: rpmdb/rpmdb.c:3333 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s dizininin silinmesi baþarýsýz: %s\n" @@ -3422,6 +3377,33 @@ msgid "failed to create %s: %s\n" msgstr "%s oluþturulamadý: %s\n" #~ msgid "" +#~ "Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n" +#~ msgstr "" +#~ "%d(0x%08x) göreli konumunda paket zinciri kopuk, yeniden baðlanmaya " +#~ "çalýþýlýyor...\n" + +#~ msgid "Reconnecting broken chain at offset %d(0x%08x).\n" +#~ msgstr "%d(0x%08x) göreli konumunda kopan zincir yeniden baðlanýyor.\n" + +#~ msgid "closed db file %s\n" +#~ msgstr "kapanan db dosyasý %s\n" + +#~ msgid "removed db file %s\n" +#~ msgstr "silinen db dosyasý %s\n" + +#~ msgid "bad db file %s\n" +#~ msgstr "db dosyasý %s hatalý\n" + +#~ msgid "opening db file %s mode 0x%x\n" +#~ msgstr "açýlan db dosyasý %s kip 0x%x\n" + +#~ msgid "cannot get %s lock on database\n" +#~ msgstr "Veritabaný için %s kilit alýnamadý\n" + +#~ msgid "error(%d) counting packages\n" +#~ msgstr "paketler taranýrken hata(%d)\n" + +#~ msgid "" #~ "free list corrupt (%u)- please run\n" #~ "\t\"rpm --rebuilddb\"\n" #~ "More information is available from http://www.rpm.org or the rpm-" diff --git a/popt/po/cs.po b/popt/po/cs.po index cd07509..b42504b 100644 --- a/popt/po/cs.po +++ b/popt/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 2001-07-24 00:03+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" diff --git a/popt/po/da.po b/popt/po/da.po index e32b17c..fc165e3 100644 --- a/popt/po/da.po +++ b/popt/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n" "Last-Translator: Martin Hansen \n" "Language-Team: Dansk \n" diff --git a/popt/po/de.po b/popt/po/de.po index fa89fb7..203c754 100644 --- a/popt/po/de.po +++ b/popt/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/es.po b/popt/po/es.po index 79fdac3..625a116 100644 --- a/popt/po/es.po +++ b/popt/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Leandro Lucarella \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/eu_ES.po b/popt/po/eu_ES.po index fa89fb7..203c754 100644 --- a/popt/po/eu_ES.po +++ b/popt/po/eu_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/fi.po b/popt/po/fi.po index fa89fb7..203c754 100644 --- a/popt/po/fi.po +++ b/popt/po/fi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/fr.po b/popt/po/fr.po index fa89fb7..203c754 100644 --- a/popt/po/fr.po +++ b/popt/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/gl.po b/popt/po/gl.po index 4a2024b..dac7820 100644 --- a/popt/po/gl.po +++ b/popt/po/gl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 2001-01-17 01:01+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" diff --git a/popt/po/hu.po b/popt/po/hu.po index c52942a..e495837 100644 --- a/popt/po/hu.po +++ b/popt/po/hu.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 2000-08-03 23:26+0200\n" "Last-Translator: László Németh \n" "Language-Team: Hungarian\n" diff --git a/popt/po/id.po b/popt/po/id.po index fa89fb7..203c754 100644 --- a/popt/po/id.po +++ b/popt/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/is.po b/popt/po/is.po index 1d1502e..44bf3dd 100644 --- a/popt/po/is.po +++ b/popt/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 2001-06-08 01:35+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" diff --git a/popt/po/it.po b/popt/po/it.po index fa89fb7..203c754 100644 --- a/popt/po/it.po +++ b/popt/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/ja.po b/popt/po/ja.po index fa89fb7..203c754 100644 --- a/popt/po/ja.po +++ b/popt/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/ko.po b/popt/po/ko.po index fa49e2a..1e0b9e7 100644 --- a/popt/po/ko.po +++ b/popt/po/ko.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 2001-09-06 20:06+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" diff --git a/popt/po/no.po b/popt/po/no.po index c2bf091..c9aabe3 100644 --- a/popt/po/no.po +++ b/popt/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 2001-06-27 11:05+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" diff --git a/popt/po/pl.po b/popt/po/pl.po index fa89fb7..203c754 100644 --- a/popt/po/pl.po +++ b/popt/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/popt.pot b/popt/po/popt.pot index 5fdb8a8..a8952cb 100644 --- a/popt/po/popt.pot +++ b/popt/po/popt.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/pt_BR.po b/popt/po/pt_BR.po index fa89fb7..203c754 100644 --- a/popt/po/pt_BR.po +++ b/popt/po/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/ro.po b/popt/po/ro.po index 75a75b2..61587e0 100644 --- a/popt/po/ro.po +++ b/popt/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 2000-06-14 23:23+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" diff --git a/popt/po/ru.po b/popt/po/ru.po index 408ffaf..5ff1527 100644 --- a/popt/po/ru.po +++ b/popt/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 2001-07-05 21:00-0500\n" "Last-Translator: Eugene Kanter \n" "Language-Team: Black Cat Linux Team \n" diff --git a/popt/po/sk.po b/popt/po/sk.po index cb00110..2f7c956 100644 --- a/popt/po/sk.po +++ b/popt/po/sk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 1999-08-04 21:40+0200\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" diff --git a/popt/po/sl.po b/popt/po/sl.po index 0ba43a0..5d462f4 100644 --- a/popt/po/sl.po +++ b/popt/po/sl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 2000-09-05 12:30+0200\n" "Last-Translator: Roman Maurer \n" "Language-Team: Slovenian \n" diff --git a/popt/po/sr.po b/popt/po/sr.po index fa89fb7..203c754 100644 --- a/popt/po/sr.po +++ b/popt/po/sr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/sv.po b/popt/po/sv.po index 9257620..2eb9a2d 100644 --- a/popt/po/sv.po +++ b/popt/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 2001-07-12 22:26+0100\n" "Last-Translator: Christian Rose \n" "Language-Team: Swedish \n" diff --git a/popt/po/tr.po b/popt/po/tr.po index b4b46ef..7e91800 100644 --- a/popt/po/tr.po +++ b/popt/po/tr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 2000-02-11 13:01+0200\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" diff --git a/popt/po/uk.po b/popt/po/uk.po index b8fa17d..83f8bdc 100644 --- a/popt/po/uk.po +++ b/popt/po/uk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 1999-09-30 16:54+0200\n" "Last-Translator: Yuri Syrota \n" "Language-Team: Ukrainian \n" diff --git a/popt/po/wa.po b/popt/po/wa.po index fdb857f..0ed342d 100644 --- a/popt/po/wa.po +++ b/popt/po/wa.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 1999-03-18 23:11+0100\n" "Last-Translator: Nobody yet\n" "Language-Team: walon \n" diff --git a/popt/po/zh.po b/popt/po/zh.po index fa89fb7..203c754 100644 --- a/popt/po/zh.po +++ b/popt/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/popt/po/zh_CN.GB2312.po b/popt/po/zh_CN.GB2312.po index b24a7e9..39f3475 100644 --- a/popt/po/zh_CN.GB2312.po +++ b/popt/po/zh_CN.GB2312.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: popt 1.6.3\n" -"POT-Creation-Date: 2002-04-08 13:11-0400\n" +"POT-Creation-Date: 2002-05-06 15:34-0400\n" "PO-Revision-Date: 1999-11-11 05:04+0800\n" "Last-Translator: Dillion Chen \n" "Language-Team: TLDN\n" diff --git a/rpm.spec.in b/rpm.spec.in index 19f6b7d..a18ee18 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -521,6 +521,11 @@ fi %{__prefix}/include/popt.h %changelog +* Mon May 6 2002 Jeff Johnson +- rework most of rpmdb.c prepatory to implementing duplicates. +- fix: 2 memory leaks in headerSprintf. +- fix: db mire's access out-of-bounds memory. + * Fri May 3 2002 Jeff Johnson 4.1-0.12 - use DBT_DB_MALLOC to eliminate re-malloc'ing header blobs. diff --git a/rpmdb/header.c b/rpmdb/header.c index 5cc6c18..a046c97 100644 --- a/rpmdb/header.c +++ b/rpmdb/header.c @@ -2128,7 +2128,7 @@ static int parseExpression(sprintfToken token, char * str, /** */ -static int parseFormat(char * str, const headerTagTableEntry tags, +static int parseFormat(/*@null@*/ char * str, const headerTagTableEntry tags, const headerSprintfExtension extensions, /*@out@*/sprintfToken * formatPtr, /*@out@*/int * numTokensPtr, /*@null@*/ /*@out@*/ char ** endPtr, int state, @@ -2146,6 +2146,7 @@ static int parseFormat(char * str, const headerTagTableEntry tags, /* upper limit on number of individual formats */ numTokens = 0; + if (str != NULL) for (chptr = str; *chptr != '\0'; chptr++) if (*chptr == '%') numTokens++; numTokens = numTokens * 2 + 1; @@ -2156,6 +2157,7 @@ static int parseFormat(char * str, const headerTagTableEntry tags, /*@-infloops@*/ /* LCL: can't detect done termination */ dst = start = str; currToken = -1; + if (start != NULL) while (*start != '\0') { switch (*start) { case '%': @@ -2362,7 +2364,8 @@ static int parseFormat(char * str, const headerTagTableEntry tags, } /*@=infloops@*/ - *dst = '\0'; + if (dst != NULL) + *dst = '\0'; currToken++; for (i = 0; i < currToken; i++) { @@ -2435,10 +2438,13 @@ static int parseExpression(sprintfToken token, char * str, } if (*chptr == '|') { - (void) parseFormat(xstrdup(""), tags, extensions, - &token->u.cond.elseFormat, - &token->u.cond.numElseTokens, &end, PARSER_IN_EXPR, - errmsg); + if (parseFormat(NULL, tags, extensions, &token->u.cond.elseFormat, + &token->u.cond.numElseTokens, &end, PARSER_IN_EXPR, errmsg)) + { + token->u.cond.ifFormat = + freeFormat(token->u.cond.ifFormat, token->u.cond.numIfTokens); + return 1; + } } else { chptr++; @@ -2962,7 +2968,7 @@ char * headerSprintf(Header h, const char * fmt, fmtString = _free(fmtString); extCache = freeExtensionCache(exts, extCache); - format = _free(format); + format = freeFormat(format, numTokens); return val; } diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c index 7e35309..74f350c 100644 --- a/rpmdb/rpmdb.c +++ b/rpmdb/rpmdb.c @@ -174,35 +174,14 @@ static void dbiTagsInit(void) } /*@-redecl@*/ -#if USE_DB1 -/*@unchecked@*/ -/*@-exportheadervar -declundef @*/ -extern struct _dbiVec db1vec; -/*@=exportheadervar =declundef @*/ -#define DB1vec &db1vec -#else #define DB1vec NULL -#endif - -#if USE_DB2 -/*@unchecked@*/ -/*@-exportheadervar -declundef @*/ -extern struct _dbiVec db2vec; -/*@=exportheadervar =declundef @*/ -#define DB2vec &db2vec -#else #define DB2vec NULL -#endif -#if USE_DB3 -/*@unchecked@*/ /*@-exportheadervar -declundef @*/ +/*@unchecked@*/ extern struct _dbiVec db3vec; /*@=exportheadervar =declundef @*/ #define DB3vec &db3vec -#else -#define DB3vec NULL -#endif /*@=redecl@*/ /*@-nullassign@*/ @@ -466,77 +445,6 @@ static int set2dbt(dbiIndex dbi, DBT * data, dbiIndexSet set) return 0; } -/** - * Return index set from key match. - * @param dbi index database handle - * @param dbcursor index database cursor - * @param key search key/length/flags - * @param data search data/length/flags - * @param flags search flags - * @return -1 error, 0 success, 1 not found - */ -static int dbiSearch(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data, - int flags) - /*@globals fileSystem @*/ - /*@modifies *dbcursor, fileSystem @*/ -{ - int rc; - -assert(flags == DB_SET); -assert(key->size != 0); - rc = dbiGet(dbi, dbcursor, key, data, flags); - - if (rc > 0) { - rpmError(RPMERR_DBGETINDEX, - _("error(%d) getting \"%s\" records from %s index\n"), - rc, key->data, tagName(dbi->dbi_rpmtag)); - } - return rc; -} - -/** - * Change/delete items that match criteria. - * @param dbi index database handle - * @param dbcursor index database cursor - * @param key update key/length/flags - * @param data update data/length/flags - * @param flags update flags - * @return 0 success, 1 not found - */ -/*@-mustmod@*/ -static int dbiUpdateIndex(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data, - int flags) - /*@globals fileSystem @*/ - /*@modifies *dbcursor, fileSystem @*/ -{ - int rc; - - if (data->data && data->size > 0) { - - rc = dbiPut(dbi, dbcursor, key, data, flags); - - if (rc) { - rpmError(RPMERR_DBPUTINDEX, - _("error(%d) storing record %s into %s\n"), - rc, key->data, tagName(dbi->dbi_rpmtag)); - } - - } else { - - rc = dbiDel(dbi, dbcursor, key, data, flags); - - if (rc) { - rpmError(RPMERR_DBPUTINDEX, - _("error(%d) removing record %s from %s\n"), - rc, key->data, tagName(dbi->dbi_rpmtag)); - } - - } - - return rc; -} -/*@=mustmod@*/ - /* XXX assumes hdrNum is first int in dbiIndexItem */ static int hdrNumCmp(const void * one, const void * two) /*@*/ @@ -578,7 +486,7 @@ static int dbiAppendSet(dbiIndexSet set, const void * recs, set->count++; } - if (set->count > 1 && sortset) + if (sortset && set->count > 1) qsort(set->recs, set->count, sizeof(*(set->recs)), hdrNumCmp); return 0; @@ -1069,7 +977,13 @@ key->data = (void *) baseName; key->size = strlen(baseName); if (key->size == 0) key->size++; /* XXX "/" fixup. */ - rc = dbiSearch(dbi, dbcursor, key, data, DB_SET); + rc = dbiGet(dbi, dbcursor, key, data, DB_SET); + if (rc > 0) { + rpmError(RPMERR_DBGETINDEX, + _("error(%d) getting \"%s\" records from %s index\n"), + rc, key->data, tagName(dbi->dbi_rpmtag)); + } + if (rc == 0) (void) dbt2set(dbi, data, &allMatches); @@ -1157,8 +1071,7 @@ DBC * dbcursor = NULL; DBT * key = alloca(sizeof(*key)); DBT * data = alloca(sizeof(*data)); dbiIndex dbi; - dbiIndexSet matches = NULL; - int rc = -1; + int rc; int xx; if (db == NULL) @@ -1166,36 +1079,38 @@ DBT * data = alloca(sizeof(*data)); memset(key, 0, sizeof(*key)); memset(data, 0, sizeof(*data)); - /* XXX - * There's a segfault here with CDB access, let's treat the symptom - * while diagnosing the disease. - */ - if (name == NULL || *name == '\0') - return 0; dbi = dbiOpen(db, RPMTAG_NAME, 0); if (dbi == NULL) return 0; - xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, 0); key->data = (void *) name; key->size = strlen(name); - rc = dbiSearch(dbi, dbcursor, key, data, DB_SET); + + xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, 0); + rc = dbiGet(dbi, dbcursor, key, data, DB_SET); xx = dbiCclose(dbi, dbcursor, 0); dbcursor = NULL; - /*@-nullpass@*/ /* FIX: matches might be NULL */ - if (rc == 0) { /* success */ -(void) dbt2set(dbi, data, &matches); - if (matches) + if (rc == 0) { /* success */ + dbiIndexSet matches; + /*@-nullpass@*/ /* FIX: matches might be NULL */ + matches = NULL; + (void) dbt2set(dbi, data, &matches); + if (matches) { rc = dbiIndexSetCount(matches); - } else if (rc > 0) /* error */ - rpmError(RPMERR_DBCORRUPT, _("error(%d) counting packages\n"), rc); - else /* not found */ + matches = dbiFreeIndexSet(matches); + } + /*@=nullpass@*/ + } else + if (rc == DB_NOTFOUND) { /* not found */ rc = 0; - /*@=nullpass@*/ - - matches = dbiFreeIndexSet(matches); + } else { /* error */ + rpmError(RPMERR_DBGETINDEX, + _("error(%d) getting \"%s\" records from %s index\n"), + rc, key->data, tagName(dbi->dbi_rpmtag)); + rc = -1; + } return rc; } @@ -1227,17 +1142,21 @@ static rpmRC dbiFindMatches(dbiIndex dbi, DBC * dbcursor, key->data = (void *) name; key->size = strlen(name); - rc = dbiSearch(dbi, dbcursor, key, data, DB_SET); - if (rc != 0) { - rc = ((rc == -1) ? RPMRC_FAIL : RPMRC_NOTFOUND); - goto exit; - } -(void) dbt2set(dbi, data, matches); + rc = dbiGet(dbi, dbcursor, key, data, DB_SET); - if (version == NULL && release == NULL) { - rc = RPMRC_OK; - goto exit; + if (rc == 0) { /* success */ + (void) dbt2set(dbi, data, matches); + if (version == NULL && release == NULL) + return RPMRC_OK; + } else + if (rc == DB_NOTFOUND) { /* not found */ + return RPMRC_NOTFOUND; + } else { /* error */ + rpmError(RPMERR_DBGETINDEX, + _("error(%d) getting \"%s\" records from %s index\n"), + rc, key->data, tagName(dbi->dbi_rpmtag)); + return RPMRC_FAIL; } /* Make sure the version and release match. */ @@ -1294,6 +1213,8 @@ exit: * @todo Name must be an exact match, as name is a db key. * @param dbi index database handle (always RPMTAG_NAME) * @param dbcursor index database cursor + * @param key search key/length/flags + * @param data search data/length/flags * @param arg name[-version[-release]] string * @retval matches set of header instances that match * @return RPMRC_OK on match, RPMRC_NOMATCH or RPMRC_FAIL @@ -1552,7 +1473,7 @@ static int miregexec(miRE mire, const char * val) } /** - * Compare iterator selctors by rpm tag (qsort/bsearch). + * Compare iterator selectors by rpm tag (qsort/bsearch). * @param a 1st iterator selector * @param b 2nd iterator selector * @return result of comparison @@ -1757,7 +1678,8 @@ int rpmdbSetIteratorRE(rpmdbMatchIterator mi, rpmTag tag, mire->eflags = eflags; mire->fnflags = fnflags; - (void) qsort(mi->mi_re, mi->mi_nre, sizeof(*mi->mi_re), mireCmp); + if (mi->mi_nre > 1) + qsort(mi->mi_re, mi->mi_nre, sizeof(*mi->mi_re), mireCmp); /*@-nullstate@*/ /* FIX: mi->mi_re->preg may be NULL */ return rc; @@ -1773,7 +1695,6 @@ int rpmdbSetIteratorRE(rpmdbMatchIterator mi, rpmTag tag, static int mireSkip (const rpmdbMatchIterator mi) /*@*/ { - HGE_t hge = (HGE_t) headerGetEntryMinMemory; HFD_t hfd = (HFD_t) headerFreeData; union { @@ -1865,15 +1786,6 @@ static int mireSkip (const rpmdbMatchIterator mi) } return (ntags == nmatches ? 0 : 1); - -} - -int rpmdbSetIteratorRelease(rpmdbMatchIterator mi, const char * release) { - return rpmdbSetIteratorRE(mi, RPMTAG_RELEASE, RPMMIRE_DEFAULT, release); -} - -int rpmdbSetIteratorVersion(rpmdbMatchIterator mi, const char * version) { - return rpmdbSetIteratorRE(mi, RPMTAG_VERSION, RPMMIRE_DEFAULT, version); } int rpmdbSetIteratorRewrite(rpmdbMatchIterator mi, int rewrite) { @@ -1930,7 +1842,6 @@ Header rpmdbNextIterator(rpmdbMatchIterator mi) */ if (mi->mi_dbc == NULL) xx = dbiCopen(dbi, dbi->dbi_txnid, &mi->mi_dbc, mi->mi_cflags); - dbi->dbi_lastoffset = mi->mi_prevoffset; key = &mi->mi_key; memset(key, 0, sizeof(*key)); @@ -1964,22 +1875,16 @@ top: uh = data->data; uhlen = data->size; -if (dbi->dbi_api == 1 && dbi->dbi_rpmtag == RPMDBI_PACKAGES && rc == EFAULT) { - rpmError(RPMERR_INTERNAL, - _("record number %u in database is bad -- skipping.\n"), dbi->dbi_lastoffset); - if (keyp && dbi->dbi_lastoffset) - memcpy(&mi->mi_offset, keyp, sizeof(mi->mi_offset)); - continue; -} - /* * If we got the next key, save the header instance number. - * For db1 Packages (db1->dbi_lastoffset != 0), always copy. + * + * (dead) For db1 Packages (db1->dbi_lastoffset != 0), always copy. + * * For db3 Packages, instance 0 (i.e. mi->mi_setx == 0) is the * largest header instance in the database, and should be * skipped. */ - if (rc == 0 && keyp && (dbi->dbi_lastoffset || mi->mi_setx)) + if (rc == 0 && keyp && mi->mi_setx) memcpy(&mi->mi_offset, keyp, sizeof(mi->mi_offset)); /* Terminate on error or end of keys */ @@ -2069,9 +1974,10 @@ static int rpmdbGrowIterator(/*@null@*/ rpmdbMatchIterator mi, int fpNum) /*@globals fileSystem @*/ /*@modifies mi, fileSystem @*/ { + DBC * dbcursor; + DBT * key; + DBT * data; dbiIndex dbi = NULL; -DBT * key; -DBT * data; dbiIndexSet set; int rc; int xx; @@ -2079,8 +1985,10 @@ DBT * data; if (mi == NULL) return 1; -key = &mi->mi_key; -data = &mi->mi_data; + + dbcursor = mi->mi_dbc; + key = &mi->mi_key; + data = &mi->mi_data; if (key->data == NULL) return 1; @@ -2088,28 +1996,33 @@ data = &mi->mi_data; if (dbi == NULL) return 1; - xx = dbiCopen(dbi, dbi->dbi_txnid, &mi->mi_dbc, 0); - rc = dbiSearch(dbi, mi->mi_dbc, key, data, DB_SET); - xx = dbiCclose(dbi, mi->mi_dbc, 0); - mi->mi_dbc = NULL; + xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, 0); + rc = dbiGet(dbi, dbcursor, key, data, DB_SET); + xx = dbiCclose(dbi, dbcursor, 0); + dbcursor = NULL; - if (rc == 0) { /* success */ + if (rc) { /* error/not found */ + if (rc != DB_NOTFOUND) + rpmError(RPMERR_DBGETINDEX, + _("error(%d) getting \"%s\" records from %s index\n"), + rc, key->data, tagName(dbi->dbi_rpmtag)); + return rc; + } - set = NULL; -(void) dbt2set(dbi, data, &set); - for (i = 0; i < set->count; i++) - set->recs[i].fpNum = fpNum; + set = NULL; + (void) dbt2set(dbi, data, &set); + for (i = 0; i < set->count; i++) + set->recs[i].fpNum = fpNum; - if (mi->mi_set == NULL) { - mi->mi_set = set; - } else { - mi->mi_set->recs = xrealloc(mi->mi_set->recs, + if (mi->mi_set == NULL) { + mi->mi_set = set; + } else { + mi->mi_set->recs = xrealloc(mi->mi_set->recs, (mi->mi_set->count + set->count) * sizeof(*(mi->mi_set->recs))); - memcpy(mi->mi_set->recs + mi->mi_set->count, set->recs, + memcpy(mi->mi_set->recs + mi->mi_set->count, set->recs, set->count * sizeof(*(mi->mi_set->recs))); - mi->mi_set->count += set->count; - set = dbiFreeIndexSet(set); - } + mi->mi_set->count += set->count; + set = dbiFreeIndexSet(set); } return rc; @@ -2161,8 +2074,6 @@ rpmdbMatchIterator rpmdbInitIterator(rpmdb db, rpmTag rpmtag, if (dbi == NULL) return NULL; - dbi->dbi_lastoffset = 0; /* db0: rewind to beginning */ - mi = xcalloc(1, sizeof(*mi)); key = &mi->mi_key; data = &mi->mi_data; @@ -2190,7 +2101,13 @@ key->size = keylen; if (key->data && key->size == 0) key->size = strlen((char *)key->data); if (key->data && key->size == 0) key->size++; /* XXX "/" fixup. */ - rc = dbiSearch(dbi, dbcursor, key, data, DB_SET); + rc = dbiGet(dbi, dbcursor, key, data, DB_SET); + if (rc > 0) { + rpmError(RPMERR_DBGETINDEX, + _("error(%d) getting \"%s\" records from %s index\n"), + rc, key->data, tagName(dbi->dbi_rpmtag)); + } + if (rc == 0) (void) dbt2set(dbi, data, &set); @@ -2251,6 +2168,7 @@ DBT * data = alloca(sizeof(*data)); HFD_t hfd = headerFreeData; Header h; sigset_t signalMask; + int ret = 0; int rc = 0; if (db == NULL) @@ -2354,8 +2272,6 @@ memset(data, 0, sizeof(*data)); xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, DB_WRITECURSOR); for (i = 0; i < rpmcnt; i++) { dbiIndexSet set; - const void * valp; - size_t vallen; int stringvalued; byte bin[32]; @@ -2374,20 +2290,20 @@ memset(data, 0, sizeof(*data)); switch (rpmtype) { case RPM_CHAR_TYPE: case RPM_INT8_TYPE: - vallen = sizeof(RPM_CHAR_TYPE); - valp = rpmvals + i; + key->size = sizeof(RPM_CHAR_TYPE); + key->data = rpmvals + i; /*@switchbreak@*/ break; case RPM_INT16_TYPE: - vallen = sizeof(int_16); - valp = rpmvals + i; + key->size = sizeof(int_16); + key->data = rpmvals + i; /*@switchbreak@*/ break; case RPM_INT32_TYPE: - vallen = sizeof(int_32); - valp = rpmvals + i; + key->size = sizeof(int_32); + key->data = rpmvals + i; /*@switchbreak@*/ break; case RPM_BIN_TYPE: - vallen = rpmcnt; - valp = rpmvals; + key->size = rpmcnt; + key->data = rpmvals; rpmcnt = 1; /* XXX break out of loop. */ /*@switchbreak@*/ break; case RPM_STRING_TYPE: @@ -2404,8 +2320,8 @@ memset(data, 0, sizeof(*data)); t = bin; for (j = 0; j < 16; j++, t++, s += 2) *t = (nibble(s[0]) << 4) | nibble(s[1]); - valp = bin; - vallen = 16; + key->data = bin; + key->size = 16; /*@switchbreak@*/ break; } /* Extract the pubkey id from the base64 blob. */ @@ -2420,14 +2336,14 @@ memset(data, 0, sizeof(*data)); memcpy(bin, dig->pubkey.signid, 8); pkt = _free(pkt); dig = _free(dig); - valp = bin; - vallen = 8; + key->data = bin; + key->size = 8; /*@switchbreak@*/ break; } /*@fallthrough@*/ default: - valp = rpmvals[i]; - vallen = strlen(rpmvals[i]); + key->data = (void *) rpmvals[i]; + key->size = strlen(rpmvals[i]); stringvalued = 1; /*@switchbreak@*/ break; } @@ -2436,7 +2352,7 @@ memset(data, 0, sizeof(*data)); if (rpmcnt == 1 && stringvalued) { rpmMessage(RPMMESS_DEBUG, _("removing \"%s\" from %s index.\n"), - valp, tagName(dbi->dbi_rpmtag)); + (char *)key->data, tagName(dbi->dbi_rpmtag)); } else { rpmMessage(RPMMESS_DEBUG, _("removing %d entries from %s index.\n"), @@ -2445,43 +2361,62 @@ memset(data, 0, sizeof(*data)); printed++; } - /* + /* XXX * This is almost right, but, if there are duplicate tag * values, there will be duplicate attempts to remove * the header instance. It's faster to just ignore errors * than to do things correctly. */ -key->data = (void *) valp; -key->size = vallen; +/* XXX with duplicates, an accurate data value and DB_GET_BOTH is needed. */ + + set = NULL; + if (key->size == 0) key->size = strlen((char *)key->data); if (key->size == 0) key->size++; /* XXX "/" fixup. */ - -/* XXX with duplicates, the data value needs to be set precisely here. */ - set = NULL; - rc = dbiSearch(dbi, dbcursor, key, data, DB_SET); -if (rc == 0) -(void) dbt2set(dbi, data, &set); + rc = dbiGet(dbi, dbcursor, key, data, DB_SET); + if (rc == 0) { /* success */ + (void) dbt2set(dbi, data, &set); + } else if (rc == DB_NOTFOUND) { /* not found */ + continue; + } else { /* error */ + rpmError(RPMERR_DBGETINDEX, + _("error(%d) getting \"%s\" records from %s index\n"), + rc, key->data, tagName(dbi->dbi_rpmtag)); + ret += 1; + continue; + } - if (rc < 0) /* not found */ - rc = 0; - else if (rc > 0) /* error */ - rc = 1; /* error message already generated from dbindex.c */ - else { /* success */ - /*@-mods@*/ /* a single rec is not modified */ - rc = dbiPruneSet(set, rec, 1, sizeof(*rec), 1); - /*@=mods@*/ -data->data = NULL; -data->size = 0; -if (set->count > 0) -(void) set2dbt(dbi, data, set); - if (rc == 0 && dbiUpdateIndex(dbi, dbcursor, key, data, 0)) - rc = 1; -if (set->count > 0) { -data->data = _free(data->data); -data->size = 0; -} + /*@-mods@*/ /* a single rec is not modified */ + rc = dbiPruneSet(set, rec, 1, sizeof(*rec), 1); + /*@=mods@*/ + + /* If nothing was pruned, then don't bother updating. */ + if (rc) { + set = dbiFreeIndexSet(set); + continue; + } + + if (set->count > 0) { + (void) set2dbt(dbi, data, set); + rc = dbiPut(dbi, dbcursor, key, data, 0); + if (rc) { + rpmError(RPMERR_DBPUTINDEX, + _("error(%d) storing record %s into %s\n"), + rc, key->data, tagName(dbi->dbi_rpmtag)); + ret += 1; + } + data->data = _free(data->data); + data->size = 0; + } else { + rc = dbiDel(dbi, dbcursor, key, data, 0); + if (rc) { + rpmError(RPMERR_DBPUTINDEX, + _("error(%d) removing record %s from %s\n"), + rc, key->data, tagName(dbi->dbi_rpmtag)); + ret += 1; + } } set = dbiFreeIndexSet(set); } @@ -2507,6 +2442,7 @@ data->size = 0; h = headerFree(h, "rpmdbRemove"); + /* XXX return ret; */ return 0; } @@ -2525,7 +2461,8 @@ DBT * data = alloca(sizeof(*data)); dbiIndex dbi; int dbix; unsigned int hdrNum = 0; - int rc = 0; + int ret = 0; + int rc; int xx; if (db == NULL) @@ -2579,17 +2516,17 @@ memset(data, 0, sizeof(*data)); key->size = keylen; /*@i@*/ data->data = datap; data->size = datalen; - rc = dbiGet(dbi, dbcursor, key, data, DB_SET); + ret = dbiGet(dbi, dbcursor, key, data, DB_SET); keyp = key->data; keylen = key->size; datap = data->data; datalen = data->size; hdrNum = 0; - if (rc == 0 && datap) + if (ret == 0 && datap) memcpy(&hdrNum, datap, sizeof(hdrNum)); ++hdrNum; - if (rc == 0 && datap) { + if (ret == 0 && datap) { /*@-refcounttrans@*/ /* FIX: datap aliases h */ memcpy(datap, &hdrNum, sizeof(hdrNum)); /*@=refcounttrans@*/ @@ -2605,7 +2542,7 @@ memset(data, 0, sizeof(*data)); /*@=kepttrans@*/ data->size = datalen; - rc = dbiPut(dbi, dbcursor, key, data, 0); + ret = dbiPut(dbi, dbcursor, key, data, 0); xx = dbiSync(dbi, 0); xx = dbiCclose(dbi, dbcursor, DB_WRITECURSOR); @@ -2615,9 +2552,9 @@ memset(data, 0, sizeof(*data)); } - if (rc) { + if (ret) { rpmError(RPMERR_DBCORRUPT, - _("error(%d) allocating new package instance\n"), rc); + _("error(%d) allocating new package instance\n"), ret); goto exit; } @@ -2719,10 +2656,9 @@ data->size = 0; printed = 0; xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, DB_WRITECURSOR); + for (i = 0; i < rpmcnt; i++) { dbiIndexSet set; - const void * valp; - size_t vallen; int stringvalued; byte bin[32]; @@ -2763,20 +2699,20 @@ data->size = 0; switch (rpmtype) { case RPM_CHAR_TYPE: case RPM_INT8_TYPE: - vallen = sizeof(int_8); - valp = rpmvals + i; + key->size = sizeof(int_8); + key->data = rpmvals + i; /*@switchbreak@*/ break; case RPM_INT16_TYPE: - vallen = sizeof(int_16); - valp = rpmvals + i; + key->size = sizeof(int_16); + key->data = rpmvals + i; /*@switchbreak@*/ break; case RPM_INT32_TYPE: - vallen = sizeof(int_32); - valp = rpmvals + i; + key->size = sizeof(int_32); + key->data = rpmvals + i; /*@switchbreak@*/ break; case RPM_BIN_TYPE: - vallen = rpmcnt; - valp = rpmvals; + key->size = rpmcnt; + key->data = rpmvals; rpmcnt = 1; /* XXX break out of loop. */ /*@switchbreak@*/ break; case RPM_STRING_TYPE: @@ -2793,8 +2729,8 @@ data->size = 0; t = bin; for (j = 0; j < 16; j++, t++, s += 2) *t = (nibble(s[0]) << 4) | nibble(s[1]); - valp = bin; - vallen = 16; + key->data = bin; + key->size = 16; /*@switchbreak@*/ break; } /* Extract the pubkey id from the base64 blob. */ @@ -2809,14 +2745,14 @@ data->size = 0; memcpy(bin, dig->pubkey.signid, 8); pkt = _free(pkt); dig = _free(dig); - valp = bin; - vallen = 8; + key->data = bin; + key->size = 8; /*@switchbreak@*/ break; } /*@fallthrough@*/ default: - valp = rpmvals[i]; - vallen = strlen(rpmvals[i]); + key->data = (void *) rpmvals[i]; + key->size = strlen(rpmvals[i]); stringvalued = 1; /*@switchbreak@*/ break; } @@ -2825,7 +2761,7 @@ data->size = 0; if (rpmcnt == 1 && stringvalued) { rpmMessage(RPMMESS_DEBUG, _("adding \"%s\" to %s index.\n"), - valp, tagName(dbi->dbi_rpmtag)); + (char *)key->data, tagName(dbi->dbi_rpmtag)); } else { rpmMessage(RPMMESS_DEBUG, _("adding %d entries to %s index.\n"), @@ -2833,46 +2769,46 @@ data->size = 0; } printed++; } -/*@-observertrans@*/ -key->data = (void *) valp; -/*@=observertrans@*/ -key->size = vallen; -if (key->size == 0) key->size = strlen((char *)key->data); -if (key->size == 0) key->size++; /* XXX "/" fixup. */ -/* XXX with duplicates, the data value needs to be set precisely here. */ +/* XXX with duplicates, an accurate data value and DB_GET_BOTH is needed. */ + set = NULL; - xx = dbiSearch(dbi, dbcursor, key, data, DB_SET); -if (xx == 0) -(void) dbt2set(dbi, data, &set); - if (xx > 0) { /* error */ - xx = 1; - } else { +if (key->size == 0) key->size = strlen((char *)key->data); +if (key->size == 0) key->size++; /* XXX "/" fixup. */ + rc = dbiGet(dbi, dbcursor, key, data, DB_SET); + if (rc == 0) { /* success */ /* With duplicates, cursor is positioned, discard the record. */ - /*@-branchstate@*/ - if (xx == 0 && dbi->dbi_permit_dups) - set = dbiFreeIndexSet(set); - /*@=branchstate@*/ - - if (set == NULL || xx < 0) { /* not found */ - xx = 0; - set = xcalloc(1, sizeof(*set)); - } - (void) dbiAppendSet(set, rec, 1, sizeof(*rec), 0); -data->data = NULL; -data->size = 0; -(void) set2dbt(dbi, data, set); - if (xx == 0 && dbiUpdateIndex(dbi, dbcursor, key, data, 0)) - xx = 1; -data->data = _free(data->data); -data->size = 0; + if (!dbi->dbi_permit_dups) + (void) dbt2set(dbi, data, &set); + } else if (rc != DB_NOTFOUND) { /* error */ + rpmError(RPMERR_DBGETINDEX, + _("error(%d) getting \"%s\" records from %s index\n"), + rc, key->data, tagName(dbi->dbi_rpmtag)); + ret += 1; + continue; } - set = dbiFreeIndexSet(set); - rc += xx; + if (set == NULL) /* not found or duplicate */ + set = xcalloc(1, sizeof(*set)); + + (void) dbiAppendSet(set, rec, 1, sizeof(*rec), 0); + + (void) set2dbt(dbi, data, set); + rc = dbiPut(dbi, dbcursor, key, data, 0); + + if (rc) { + rpmError(RPMERR_DBPUTINDEX, + _("error(%d) storing record %s into %s\n"), + rc, key->data, tagName(dbi->dbi_rpmtag)); + ret += 1; + } + data->data = _free(data->data); + data->size = 0; + set = dbiFreeIndexSet(set); } + xx = dbiCclose(dbi, dbcursor, DB_WRITECURSOR); dbcursor = NULL; @@ -2895,7 +2831,7 @@ data->size = 0; exit: (void) unblockSignals(db, &signalMask); - return rc; + return ret; } /* XXX transaction.c */ -- 2.7.4